Index: lams_central/web/css/defaultHTML_learner.css
===================================================================
diff -u -r2b55e5065b31abc0aef66d2513dfa98c1a4ef647 -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision 2b55e5065b31abc0aef66d2513dfa98c1a4ef647)
+++ lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -636,3 +636,9 @@
 	padding-top: 2px;
 	border-top: 1px solid#e7e7e7;
 }
+
+/* fontawesome icon x-small */
+.fa-xs {
+	font-size: smaller;
+}
+}
\ No newline at end of file
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -rd28a91914e8858e0fbc045fc9313e3b50a309c45 -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision d28a91914e8858e0fbc045fc9313e3b50a309c45)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -141,20 +141,20 @@
 					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
 				
-				<div class="form-group">
-				    <label for="defaultGrade">
-				    	<fmt:message key="label.authoring.basic.default.question.grade" />
-				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
-				</div>
-				
 				<div class="checkbox">
 					<label for="answer-required">
 						<html:checkbox property="answerRequired" styleId="answer-required"/>
 						<fmt:message key="label.authoring.answer.required" />
 					</label>
 				</div>
+
+				<div class="form-group form-inline">
+				    <label for="defaultGrade">
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />:
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+				    </label>
+				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
+				</div>
 				
 				<div class="checkbox">
 					<label for="allow-rich-editor">
@@ -182,8 +182,8 @@
 				</div>
 
 				<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="collapse form-group">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="voffset5 collapse <c:if test="${not empty formBean.generalFeedback}">in</c:if> form-group">
 						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
 					</div>
 				</div>
@@ -195,7 +195,7 @@
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
-					<fmt:message key="label.authoring.essay.add.essay" />
+					<fmt:message key="label.authoring.save.button" />
 				</a>
 				
 			</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
===================================================================
diff -u -rd28a91914e8858e0fbc045fc9313e3b50a309c45 -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision d28a91914e8858e0fbc045fc9313e3b50a309c45)
+++ lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -128,28 +128,21 @@
 					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
 				
-				<div class="form-group">
-				    <label for="defaultGrade">
-				    	<fmt:message key="label.authoring.basic.default.question.grade" />
-				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
-				</div>
-				
 				<div class="checkbox">
 					<label for="answer-required">
 						<html:checkbox property="answerRequired" styleId="answer-required"/>
 						<fmt:message key="label.authoring.answer.required" />
 					</label>
 				</div>
-				
-				<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="collapse form-group">
-						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
-					</div>
+
+				<div class="form-group form-inline">
+				    <label for="defaultGrade">
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />:
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+				    </label>
+				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
-	
+					
 				<div class="checkbox">
 					<label for="shuffle">
 						<html:checkbox property="shuffle" styleId="shuffle"/>
@@ -163,6 +156,13 @@
 						<fmt:message key="label.ask.for.hedging.justification" />
 					</label>
 				</div>
+
+				<div class="generalFeedback">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="voffset5 collapse form-group <c:if test="${not empty formBean.generalFeedback}">in</c:if>">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
+					</div>
+				</div>
 				
 				<h5 class="voffset20">
 					<fmt:message key="label.authoring.basic.answer.options" />
@@ -183,9 +183,9 @@
 			<!-- Overall feedback -->
 			<br/>
 			<div class="overallFeedback">
-			  <a data-toggle="collapse" data-target="#overall-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.choice.overall.feedback" /></a>
+			  <a data-toggle="collapse" data-target="#overall-feedback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.choice.overall.feedback" /></a>
 			
-				<div id="overall-feedback" class="collapse">
+				<div id="overall-feedback" class="collapse <c:if test="${(not empty formBean.feedbackOnCorrect) || (not empty formBean.feedbackOnPartiallyCorrect) || (not empty formBean.feedbackOnIncorrect) }">in</c:if>">
 					<div class="form-group">
 						<label for="feedbackOnCorrectOutsideForm">
 							<fmt:message key="label.authoring.choice.feedback.on.correct" />
@@ -214,7 +214,7 @@
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
-					<fmt:message key="label.authoring.choice.add.multiple.choice" />
+					<fmt:message key="label.authoring.save.button" />
 				</a>
 				
 			</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -rd28a91914e8858e0fbc045fc9313e3b50a309c45 -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision d28a91914e8858e0fbc045fc9313e3b50a309c45)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -131,42 +131,40 @@
 					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
 				
-				<div class="form-group">
+				<div class="checkbox">
+					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
+						<fmt:message key="label.authoring.answer.required" />
+					</label>
+				</div>
+
+				<div class="form-group form-inline">
 				    <label for="defaultGrade">
-				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />:
 				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
-				</div>
-				
-				<div class="form-group">
-				    <label for="penaltyFactor">
-				    	<fmt:message key="label.authoring.basic.penalty.factor" />
+				    <label class="loffset10" for="penaltyFactor"> 
+				    	<fmt:message key="label.authoring.basic.penalty.factor" />:
 						  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
 				
+										
 				<div class="checkbox">
-					<label for="answer-required">
-						<html:checkbox property="answerRequired" styleId="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
+					<label for="shuffle">
+						<html:checkbox property="shuffle" styleId="shuffle"/>
+						<fmt:message key="label.authoring.basic.shuffle.the.choices" />
 					</label>
 				</div>
-				
+
 				<div class="generalFeedback">
 				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
 					<div id="general-feedback"  class="collapse form-group">
 						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
 					</div>
 				</div>
-						
-				<div class="checkbox">
-					<label for="shuffle">
-						<html:checkbox property="shuffle" styleId="shuffle"/>
-						<fmt:message key="label.authoring.basic.shuffle.the.choices" />
-					</label>
-				</div>
 				
 				<h5 class="voffset20">
 					<fmt:message key="label.authoring.matching.pairs.matching.pairs" />
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -rd28a91914e8858e0fbc045fc9313e3b50a309c45 -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision d28a91914e8858e0fbc045fc9313e3b50a309c45)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -151,36 +151,26 @@
 					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
 				
-				<div class="form-group">
+				<div class="checkbox">
+					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
+						<fmt:message key="label.authoring.answer.required" />
+					</label>
+				</div>
+				
+				<div class="form-group form-inline">
 				    <label for="defaultGrade">
-				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />:
 				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
-				</div>
-				
-				<div class="form-group">
-				    <label for="penaltyFactor">
-				    	<fmt:message key="label.authoring.basic.penalty.factor" />
+				    <label class="loffset10" for="penaltyFactor"> 
+				    	<fmt:message key="label.authoring.basic.penalty.factor" />:
 						  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
 				
-				<div class="checkbox">
-					<label for="answer-required">
-						<html:checkbox property="answerRequired" styleId="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
-				</div>
-				
-				<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="collapse form-group">
-						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
-					</div>
-				</div>
-				
 				<div class="form-inline form-group">
 					<label for="multipleAnswersAllowed">
 						<fmt:message key="label.authoring.choice.one.multiple.answers" />
@@ -205,6 +195,14 @@
 					</label>
 				</div>
 				
+				<div class="generalFeedback">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="voffset5 collapse <c:if test="${not empty formBean.generalFeedback}">in</c:if> form-group">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
+					</div>
+				</div>
+				
+				
 				<h5 class="voffset20">
 					<fmt:message key="label.authoring.basic.answer.options" />
 				</h5>
@@ -223,9 +221,9 @@
 			
 			<!-- Overall feedback -->
 			<div class="overallFeedback">
-			  <a data-toggle="collapse" data-target="#overall-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.choice.overall.feedback" /></a>
+			  <a data-toggle="collapse" data-target="#overall-feedback"><i class="fa fa-xs a-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.choice.overall.feedback" /></a>
 
-				<div id="overall-feedback" class="collapse">				
+				<div id="overall-feedback" class="collapse <c:if test="${(not empty formBean.feedbackOnCorrect) || (not empty formBean.feedbackOnPartiallyCorrect) || (not empty formBean.feedbackOnIncorrect) }">in</c:if>">				
 				<div class="form-group">
 						<label for="feedbackOnCorrectOutsideForm">
 							<fmt:message key="label.authoring.choice.feedback.on.correct" />
@@ -255,7 +253,7 @@
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
-					<fmt:message key="label.authoring.choice.add.multiple.choice" />
+					<fmt:message key="label.authoring.save.button" />
 				</a>
 				
 			</div>			
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -rd28a91914e8858e0fbc045fc9313e3b50a309c45 -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision d28a91914e8858e0fbc045fc9313e3b50a309c45)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -198,32 +198,30 @@
 					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
 				
-				<div class="form-group">
+				<div class="checkbox">
+					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
+						<fmt:message key="label.authoring.answer.required" />
+					</label>
+				</div>
+				
+				<div class="form-group form-inline">
 				    <label for="defaultGrade">
-				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />:
 				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
-				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
-				</div>
-				
-				<div class="form-group">
-				    <label for="penaltyFactor">
-				    	<fmt:message key="label.authoring.basic.penalty.factor" />
+				    <html:text property="defaultGrade" styleClass="number form-control short-input-text input-sm"/>
+
+				    <label class="loffset10" for="penaltyFactor"> 
+				    	<fmt:message key="label.authoring.basic.penalty.factor" />: 
 						  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
 				
-				<div class="checkbox">
-					<label for="answer-required">
-						<html:checkbox property="answerRequired" styleId="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
-				</div>
-				
   			<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="collapse form-group">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="voffset5 collapse <c:if test="${not empty formBean.generalFeedback}">in</c:if> form-group">
 						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
 					</div>
 				</div>				
@@ -262,7 +260,7 @@
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
-					<fmt:message key="label.authoring.numerical.add.numerical" />
+					<fmt:message key="label.authoring.save.button" />
 				</a>
 				
 			</div>			
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -rd28a91914e8858e0fbc045fc9313e3b50a309c45 -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision d28a91914e8858e0fbc045fc9313e3b50a309c45)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -130,33 +130,31 @@
 		            	
 					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
+
+				<div class="checkbox">
+					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
+						<fmt:message key="label.authoring.answer.required" />
+					</label>
+				</div>
 				
-				<div class="form-group">
+				<div class="form-group form-inline">
 				    <label for="defaultGrade">
-				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />:
 				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
-				</div>
-				
-				<div class="form-group">
-				    <label for="penaltyFactor">
-				    	<fmt:message key="label.authoring.basic.penalty.factor" />
+
+				    <label class="loffset10" for="penaltyFactor">
+				    	<fmt:message key="label.authoring.basic.penalty.factor" />:
 						  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				
-				<div class="checkbox">
-					<label for="answer-required">
-						<html:checkbox property="answerRequired" styleId="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
-				</div>
-				
+								
 				<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="collapse form-group">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="voffset5 collapse <c:if test="${not empty formBean.generalFeedback}">in</c:if> form-group">
 						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
 					</div>
 				</div>
@@ -178,9 +176,9 @@
 						
 			<!-- Overall feedback -->
 			<div class="overallFeedback">
-			  <a data-toggle="collapse" data-target="#overall-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.choice.overall.feedback" /></a>
+			  <a data-toggle="collapse" data-target="#overall-feedback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.choice.overall.feedback" /></a>
 
-				<div id="overall-feedback" class="collapse">				
+				<div id="overall-feedback" class="collapse <c:if test="${(not empty formBean.feedbackOnCorrect) || (not empty formBean.feedbackOnIncorrect)}">in</c:if>">				
 					<div class="form-group">
 						<label for="feedbackOnCorrectOutsideForm">
 							<fmt:message key="label.authoring.choice.feedback.on.correct" />
@@ -202,7 +200,7 @@
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
-					<fmt:message key="label.authoring.ordering.add.ordering" />
+					<fmt:message key="label.authoring.save.button" />
 				</a>
 				
 			</div>			
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -rd28a91914e8858e0fbc045fc9313e3b50a309c45 -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision d28a91914e8858e0fbc045fc9313e3b50a309c45)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -136,45 +136,43 @@
 					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
 				
-				<div class="form-group">
+				<div class="checkbox">
+					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
+						<fmt:message key="label.authoring.answer.required" />
+					</label>
+				</div>
+				
+				<div class="form-group form-inline">
 				    <label for="defaultGrade">
-				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />:
 				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
-				</div>
-				
-				<div class="form-group">
-				    <label for="penaltyFactor">
-				    	<fmt:message key="label.authoring.basic.penalty.factor" />
+				    
+				    <label class="loffset10" for="penaltyFactor"> 
+				    	<fmt:message key="label.authoring.basic.penalty.factor" />:
 						<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				
-				<div class="checkbox">
-					<label for="answer-required">
-						<html:checkbox property="answerRequired" styleId="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
-				</div>
-				
-				<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="collapse form-group">
-						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
-					</div>
-				</div>
-									
+																	
 				<div class="form-inline form-group">
 					<label for="caseSensitive">
-						<fmt:message key="label.authoring.short.answer.case.sensitivity" />
+						<fmt:message key="label.authoring.short.answer.case.sensitivity" />:
 					</label>
 					<html:select property="caseSensitive" styleClass="form-control input-sm">
 						<html:option value="false"><fmt:message key="label.authoring.short.answer.no.case.unimportant" /></html:option>
 						<html:option value="true"><fmt:message key="label.authoring.short.answer.yes.case.must.match" /></html:option>
 					</html:select>
 				</div>
+
+				<div class="generalFeedback">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="voffset5 collapse <c:if test="${not empty formBean.generalFeedback}">in</c:if> form-group">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
+					</div>
+				</div>
 				
 				<h5 class="voffset20">
 					<fmt:message key="label.authoring.short.answer.answers" />
@@ -197,7 +195,7 @@
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
-					<fmt:message key="label.authoring.short.answer.add.short.answer" />
+					<fmt:message key="label.authoring.save.button" />
 				</a>
 				
 			</div>			
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -rd28a91914e8858e0fbc045fc9313e3b50a309c45 -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision d28a91914e8858e0fbc045fc9313e3b50a309c45)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -109,37 +109,37 @@
 					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
 				
-				<div class="form-group">
+				<div class="checkbox">
+					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
+						<fmt:message key="label.authoring.answer.required" />
+					</label>
+				</div>				
+				
+				<div class="form-group form-inline">
 				    <label for="defaultGrade">
-				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />:
 				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
-				</div>
-				
-				<div class="form-group">
-				    <label for="penaltyFactor">
-				    	<fmt:message key="label.authoring.basic.penalty.factor" />
+				    
+				    <label class="loffset10" for="penaltyFactor">
+				    	<fmt:message key="label.authoring.basic.penalty.factor" />:
 						<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				
-				<div class="checkbox">
-					<label for="answer-required">
-						<html:checkbox property="answerRequired" styleId="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
-				</div>
-				
+								
 				<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="collapse form-group">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="collapse <c:if test="${not empty formBean.generalFeedback}">in</c:if> form-group">
 						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
 					</div>
 				</div>
 				
-				<div class="form-inline form-group">
+				<hr>
+				
+				<div class="voffset10 form-inline form-group">
 					<label for="correctAnswer">
 						<fmt:message key="label.authoring.true.false.correct.answer" />
 					</label>
@@ -149,30 +149,32 @@
 					</html:select>
 				</div>
 				
-				<div class="form-group">
-					<label for="question">
-						<fmt:message key="label.authoring.true.false.feedback.on.true" />
-					</label>
-		            	
-					<lams:CKEditor id="feedbackOnCorrect" value="${formBean.feedbackOnCorrect}" contentFolderID="${formBean.contentFolderID}"/>
+				<a data-toggle="collapse" data-target="#feedback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.option.feedback"></fmt:message></a>
+				<div id="feedback" class="voffset5 collapse  <c:if test="${(not empty formBean.feedbackOnCorrect) || (not empty formBean.feedbackOnIncorrect)}">in</c:if>">
+					<div class="form-group voffset10">
+						<label for="feedbackOnCorrect">
+							<fmt:message key="label.authoring.true.false.feedback.on.true" />
+						</label>
+			            	
+						<lams:CKEditor id="feedbackOnCorrect" value="${formBean.feedbackOnCorrect}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
+					
+					<div class="form-group">
+						<label for="feedbackOnIncorrect">
+							<fmt:message key="label.authoring.true.false.feedback.on.false" />
+						</label>
+			            	
+						<lams:CKEditor id="feedbackOnIncorrect" value="${formBean.feedbackOnIncorrect}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
 				</div>
-				
-				<div class="form-group">
-					<label for="question">
-						<fmt:message key="label.authoring.true.false.feedback.on.false" />
-					</label>
-		            	
-					<lams:CKEditor id="feedbackOnIncorrect" value="${formBean.feedbackOnIncorrect}" contentFolderID="${formBean.contentFolderID}"/>
-				</div>
-				
 			</html:form>
 
 			<div class="voffset10 pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
-					<fmt:message key="label.authoring.true.false.add.true.false" />
+					<fmt:message key="label.authoring.save.button" />
 				</a>
 				
 			</div>			
Index: lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp	(.../matchingpairoption.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp	(.../matchingpairoption.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -2,7 +2,7 @@
 
 <div class="form-group">
 	<label for="optionQuestion${status.index}">
-		<fmt:message key="label.authoring.basic.option.question"/> ${status.index+1}
+		<fmt:message key="label.authoring.basic.option.question"/>&nbsp;${status.index+1}
 	</label>
 		            	
 	<lams:CKEditor id="optionQuestion${status.index}" value="${option.question}" contentFolderID="${contentFolderID}"/>
Index: lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp	(.../numericaloption.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp	(.../numericaloption.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -3,7 +3,7 @@
 <table class="table-row-spacing">
 	<tr>
 		<td style="width: 120px;">
-			<fmt:message key="label.authoring.basic.option.answer"/> ${status.index+1}
+			<fmt:message key="label.authoring.basic.option.answer"/>&nbsp;${status.index+1}
 		</td>
 		<td>
 			<div class="form-inline">    	
@@ -42,10 +42,11 @@
 		<td colspan="2">
 			<div class="form-group">
 				<label for="optionFeedback${status.index}">
-					<fmt:message key="label.authoring.basic.option.feedback"></fmt:message>
+					<a data-toggle="collapse" data-target="#feedback${status.index}"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.option.feedback"></fmt:message></a>
 				</label>
-					            	
-				<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}"/>
+				<div id="feedback${status.index}" class="collapse <c:if test="${not empty option.feedback}">in</c:if>">
+					<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}"/>
+				</div>	
 			</div>
 		</td>
 	</tr>
Index: lams_tool_assessment/web/pages/authoring/parts/option.jsp
===================================================================
diff -u -r433d32f65d1b9611cdc18999348493025d9de1ea -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/option.jsp	(.../option.jsp)	(revision 433d32f65d1b9611cdc18999348493025d9de1ea)
+++ lams_tool_assessment/web/pages/authoring/parts/option.jsp	(.../option.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -8,16 +8,18 @@
 	<lams:CKEditor id="optionString${status.index}" value="${option.optionString}" contentFolderID="${contentFolderID}" />
 </div>
 
-<div class="form-group">
+<div class="form-group form-inline">
 	<label>
-		<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
+		<fmt:message key="label.authoring.basic.option.grade"></fmt:message>: 
 	</label>
 	<%@ include file="gradeselector.jsp"%>
 </div>
 
 <div class="form-group">
     <label for="optionFeedback${status.index}">
-    	<fmt:message key="label.authoring.basic.option.feedback"></fmt:message>
+    	<a data-toggle="collapse" data-target="#feedback${status.index}"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.option.feedback"></fmt:message></a>
     </label>
+    <div id="feedback${status.index}" class="collapse <c:if test="${not empty option.feedback}">in</c:if>">
      <lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}" />
+   </div> 
 </div>
Index: lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp
===================================================================
diff -u -r12bd98959d5ca06fa9f5034ace954fb8aee07786 -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision 12bd98959d5ca06fa9f5034ace954fb8aee07786)
+++ lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -2,7 +2,7 @@
 
 <div class="form-group">
 	<label for="optionString${status.index}">
-		<fmt:message key="label.authoring.basic.option.answer"/> ${status.index+1}
+		<fmt:message key="label.authoring.basic.option.answer"/>&nbsp;${status.index+1}
 	</label>
 	<lams:CKEditor id="optionString${status.index}" value="${option.optionString}" contentFolderID="${contentFolderID}" />
 </div>
@@ -18,16 +18,17 @@
 
 <div class="form-group form-inline">
 	<label for="optionGrade${status.index}">
-		<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
+		<fmt:message key="label.authoring.basic.option.grade"></fmt:message>:
 	</label>
 	<%@ include file="gradeselector.jsp"%>
 </div>
 
 <div class="form-group">
     <label for="optionFeedback${status.index}">
-    	<fmt:message key="label.authoring.basic.option.feedback"/>
+    	<a data-toggle="collapse" data-target="#feedback${status.index}"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.option.feedback"></fmt:message></a>
     </label>
-    
-     <lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}" />
+    <div id="feedback${status.index}" class="collapse <c:if test="${not empty option.feedback}">in</c:if>">
+    	<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}" />
+    </div>	
 </div>
 
Index: lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp	(.../orderingoption.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp	(.../orderingoption.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -2,7 +2,7 @@
 
 <div class="form-group">
 	<label for="optionString${status.index}">
-		<fmt:message key="label.authoring.basic.option.answer"/> ${status.index+1}
+		<fmt:message key="label.authoring.basic.option.answer"/>&nbsp;${status.index+1}
 	</label>
 		            	
 	<lams:CKEditor id="optionString${status.index}" value="${option.optionString}" contentFolderID="${contentFolderID}"/>
Index: lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r7d9183dae4b97543c969ec26ae1494073761dc02
--- lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp	(.../shortansweroption.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp	(.../shortansweroption.jsp)	(revision 7d9183dae4b97543c969ec26ae1494073761dc02)
@@ -2,22 +2,23 @@
 
 <div class="form-group">
 	<label for="optionString${status.index}">
-		<fmt:message key="label.authoring.basic.option.answer"/> ${status.index+1}
+		<fmt:message key="label.authoring.basic.option.answer"/>&nbsp;${status.index+1}
 	</label>
 	<input type="text" name="optionString${status.index}" value="<c:out value='${option.optionString}' />" class="form-control input-sm"/>
 </div>
 
-<div class="form-group">
+<div class="form-group form-inline">
 	<label>
-		<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
+		<fmt:message key="label.authoring.basic.option.grade"></fmt:message>:
 	</label>
 	<%@ include file="gradeselector.jsp"%>
 </div>
 
 <div class="form-group">
     <label for="optionFeedback${status.index}">
-    	<fmt:message key="label.authoring.basic.option.feedback"/>
+    	<a data-toggle="collapse" data-target="#feedback${status.index}"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.option.feedback"/></a>
     </label>
-    
-    <lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}"/>
+    <div id="feedback${status.index}" class="collapse <c:if test="${not empty option.feedback}">in</c:if>">
+    	<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}"/>
+    </div>	
 </div>