Index: lams_tool_daco/web/includes/javascript/dacoAuthoring.js
===================================================================
diff -u -rb06bfc55f834d109bdc49deba23633fec403cfa4 -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/includes/javascript/dacoAuthoring.js	(.../dacoAuthoring.js)	(revision b06bfc55f834d109bdc49deba23633fec403cfa4)
+++ lams_tool_daco/web/includes/javascript/dacoAuthoring.js	(.../dacoAuthoring.js)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -22,10 +22,13 @@
    function toggleAdditionalOptionsArea(){
 	$("#additionalOptionsArea").toggle("slow",function(){
 			if ($('#additionalOptionsArea').is(':visible')){
-				$('#toggleAdditionalOptionsAreaLink').text(msgHideAdditionalOptions);	
+				$('#toggleAdditionalOptionsAreaLink').text(msgHideAdditionalOptions);
+				$('#faIcon').toggleClass('fa-plus-square-o fa-minus-square-o');
 			}
 			else {
-				$('#toggleAdditionalOptionsAreaLink').text(msgShowAdditionalOptions);	
+				$('#toggleAdditionalOptionsAreaLink').text(msgShowAdditionalOptions);
+				$('#faIcon').toggleClass('fa-plus-square-o fa-minus-square-o')
+				
 			}
 		});
 	}
Index: lams_tool_daco/web/pages/authoring/basic.jsp
===================================================================
diff -u -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678 -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
+++ lams_tool_daco/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -87,7 +87,7 @@
 <!-- Dropdown menu for choosing a question type -->
 <div id="questionListArea"><c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 <%@ include	file="/pages/authoring/parts/questionlist.jsp"%></div>
-<div class="form-inline"><select id="questionTypeDropdown" class="form-control">
+<div class="form-inline"><select id="questionTypeDropdown" class="form-control input-sm">
 	<option selected="selected"><fmt:message key="label.authoring.basic.textfield"/></option>
 	<option><fmt:message key="label.authoring.basic.textarea"/></option>
 	<option><fmt:message key="label.authoring.basic.number"/></option>
Index: lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp
===================================================================
diff -u -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678 -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	(.../addcheckbox.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
+++ lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	(.../addcheckbox.jsp)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -40,34 +40,30 @@
 	<%@ include file="description.jsp"%>
 
 	<!--  Options -->  
-	<div class="voffset5" style="display: inline-block;">
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="visible-sm-block visible-md-block btn btn-default btn-xs pull-left"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	</div>
-	<div id="additionalOptionsArea" style="display: none;">
- 		<div class="form-inline">
+	<a href="javascript:toggleAdditionalOptionsArea()" class="fa-xs"><i id="faIcon" class="fa fa-plus-square-o"></i> <span id="toggleAdditionalOptionsAreaLink"><fmt:message key="label.authoring.basic.additionaloptions.show" /></span></a>
+	<div id="additionalOptionsArea" style="display: none;" class="panel-body">
 		<div class="form-group">
-    	<label for="min"><fmt:message key="label.authoring.basic.min.select" /></label>
-		<html:text styleId="min" property="min" size="10" styleClass="form-control"/>
+			<div class="checkbox">
+			    <label>
+		 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+			    </label>
+		  </div>
 		</div>
 		<div class="form-group">
-    	<label for="max"><fmt:message key="label.authoring.basic.max.select" /></label>
-		<html:text styleId="max" property="max" size="10" styleClass="form-control"/>
+    	<label for="min"><fmt:message key="label.authoring.basic.min.select" /></label>:
+			<html:text styleId="min" property="min" size="10" styleClass="form-control-inline input-sm"/>
+    	<label class="roffset5" for="max"><fmt:message key="label.authoring.basic.max.select" /></label>
+			<html:text styleId="max" property="max" size="10" styleClass="form-control-inline input-sm"/>
 		</div>
 		<div class="form-group">
-    	<label for="summary"><fmt:message key="label.common.summary" /></label>
-		<html:select property="summary" styleClass="form-control">
-			<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
-			<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
-			<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
-		</html:select>
+    	<label for="summary"><fmt:message key="label.common.summary" /></label>:
+			<html:select property="summary" styleClass="form-control-inline input-sm">
+				<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
+				<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
+				<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
+			</html:select>
 		</div>
-		<div class="checkbox">
-		    <label>
-	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
-		    </label>
-	  	</div>
-	  	</div>
-	</div>
+	 </div>
  	<!--  end options -->
   
 </html:form>
Index: lams_tool_daco/web/pages/authoring/parts/adddate.jsp
===================================================================
diff -u -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678 -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/pages/authoring/parts/adddate.jsp	(.../adddate.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
+++ lams_tool_daco/web/pages/authoring/parts/adddate.jsp	(.../adddate.jsp)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -35,8 +35,8 @@
 	<%@ include file="description.jsp"%>
 
 	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	<div id="additionalOptionsArea" style="display: none;">
+	<a href="javascript:toggleAdditionalOptionsArea()" class="fa-xs"><i id="faIcon" class="fa fa-plus-square-o"></i> <span id="toggleAdditionalOptionsAreaLink"><fmt:message key="label.authoring.basic.additionaloptions.show" /></span></a>
+	<div id="additionalOptionsArea" style="display: none;" class="panel-body">
 		<div class="checkbox">
 		    <label>
 	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
Index: lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp
===================================================================
diff -u -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678 -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
+++ lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -40,24 +40,24 @@
 	<%@ include file="description.jsp"%>
   
   	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	<div id="additionalOptionsArea" style="display: none;">
- 		<div class="form-inline">
+	<a href="javascript:toggleAdditionalOptionsArea()" class="fa-xs"><i id="faIcon" class="fa fa-plus-square-o"></i> <span id="toggleAdditionalOptionsAreaLink"><fmt:message key="label.authoring.basic.additionaloptions.show" /></span></a>
+	<div id="additionalOptionsArea" style="display: none;" class="panel-body">
 		<div class="form-group">
-    	<label for="summary"><fmt:message key="label.common.summary" /></label>
-		<html:select property="summary" styleClass="form-control">
-			<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
-			<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
-			<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
-		</html:select>
+    	<label for="summary"><fmt:message key="label.common.summary" /></label>: 
+			<html:select property="summary" styleClass="form-control-inline input-sm">
+				<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
+				<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
+				<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
+			</html:select>
 		</div>
-		<div class="checkbox">
-		    <label>
-	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
-		    </label>
-	  	</div>
-	  	</div>
-	</div>
+		<div class="form-group">
+			<div class="checkbox">
+			    <label>
+		 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+			    </label>
+		  	</div>
+		</div>
+	</div>	
  	<!--  end options -->
 	
 </html:form>
Index: lams_tool_daco/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678 -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
+++ lams_tool_daco/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -37,8 +37,8 @@
 	<%@ include file="description.jsp"%>
   
 	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	<div id="additionalOptionsArea" style="display: none;">
+	<a href="javascript:toggleAdditionalOptionsArea()" class="fa-xs"><i id="faIcon" class="fa fa-plus-square-o"></i> <span id="toggleAdditionalOptionsAreaLink"><fmt:message key="label.authoring.basic.additionaloptions.show" /></span></a>
+	<div id="additionalOptionsArea" style="display: none;" class="panel-body">
 		<div class="checkbox">
 		    <label>
 	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
Index: lams_tool_daco/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678 -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
+++ lams_tool_daco/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -37,8 +37,8 @@
 	<%@ include file="description.jsp"%>
   
 	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	<div id="additionalOptionsArea" style="display: none;">
+	<a href="javascript:toggleAdditionalOptionsArea()" class="fa-xs"><i id="faIcon" class="fa fa-plus-square-o"></i> <span id="toggleAdditionalOptionsAreaLink"><fmt:message key="label.authoring.basic.additionaloptions.show" /></span></a>
+	<div id="additionalOptionsArea" style="display: none;" class="panel-body">
 		<div class="checkbox">
 		    <label>
 	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
Index: lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp
===================================================================
diff -u -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678 -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
+++ lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -40,12 +40,12 @@
 	<%@ include file="description.jsp"%>
   
 	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	<div id="additionalOptionsArea" style="display: none;">
+	<a href="javascript:toggleAdditionalOptionsArea()" class="fa-xs"><i id="faIcon" class="fa fa-plus-square-o"></i> <span id="toggleAdditionalOptionsAreaLink"><fmt:message key="label.authoring.basic.additionaloptions.show" /></span></a>
+	<div id="additionalOptionsArea" style="display: none;" class="panel-body">
  		<div class="form-inline">
 		<div class="checkbox">
 		    <label>
-	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+	 	      <html:checkbox property="questionRequired" styleClass="input-sm form-control" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
 		    </label>
 	  	</div>
 	  	</div>
Index: lams_tool_daco/web/pages/authoring/parts/addnumber.jsp
===================================================================
diff -u -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678 -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	(.../addnumber.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
+++ lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	(.../addnumber.jsp)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -37,34 +37,29 @@
 	<%@ include file="description.jsp"%>
   
   	<!--  Options -->  
-	<div class="voffset5" style="display: inline-block;">
-	  <a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-left"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	</div>
-	<div id="additionalOptionsArea" style="display: none;" class="voffset5">
- 		<div class="form-inline">
-		<div class="form-group">
-    	<label for=min><fmt:message key="label.common.min" />: </label>
-		<html:text styleId="min" property="min" size="5" styleClass="form-control"/>
-		</div>
-		<div class="form-group">
-    	<label for="max"><fmt:message key="label.common.max" />: </label>
-		<html:text styleId="max" property="max" size="5" styleClass="form-control"/>
-		</div>
-		<div class="form-group">
-    	<label for="summary"><fmt:message key="label.common.summary" />: </label>
-		<html:select property="summary" styleClass="form-control">
-			<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
-			<html:option value="1"><fmt:message key="label.common.summary.sum" /></html:option>
-			<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
-			<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
-		</html:select>
-		</div>
-		<div class="checkbox">
-		    <label>
-	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
-		    </label>
-	  	</div>
-	  	</div>
+	<a href="javascript:toggleAdditionalOptionsArea()" class="fa-xs"><i id="faIcon" class="fa fa-plus-square-o"></i> <span id="toggleAdditionalOptionsAreaLink"><fmt:message key="label.authoring.basic.additionaloptions.show" /></span></a>
+	<div id="additionalOptionsArea" style="display: none;" class="panel-body">
+
+			<div class="form-group">
+	    	<label for=min><fmt:message key="label.common.min" />: </label>
+				<html:text styleId="min" property="min" size="5" styleClass="form-control-inline input-sm"/>
+	    	<label class="roffset10" for="max"><fmt:message key="label.common.max" />: </label>
+				<html:text styleId="max" property="max" size="5" styleClass="form-control-inline input-sm"/>
+			</div>
+			<div class="form-group">
+	    	<label for="summary"><fmt:message key="label.common.summary" />: </label>
+				<html:select property="summary" styleClass="form-control-inline input-sm">
+					<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
+					<html:option value="1"><fmt:message key="label.common.summary.sum" /></html:option>
+					<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
+					<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
+				</html:select>
+			</div>
+			<div class="checkbox">
+			    <label>
+		 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+			    </label>
+		  </div>
 	</div>	
  	<!--  end options -->
   
Index: lams_tool_daco/web/pages/authoring/parts/addradio.jsp
===================================================================
diff -u -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678 -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/pages/authoring/parts/addradio.jsp	(.../addradio.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
+++ lams_tool_daco/web/pages/authoring/parts/addradio.jsp	(.../addradio.jsp)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -40,25 +40,25 @@
 	<%@ include file="description.jsp"%>
 
   	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	<div id="additionalOptionsArea" style="display: none;">
- 		<div class="form-inline">
+	<a href="javascript:toggleAdditionalOptionsArea()" class="fa-xs"><i id="faIcon" class="fa fa-plus-square-o"></i> <span id="toggleAdditionalOptionsAreaLink"><fmt:message key="label.authoring.basic.additionaloptions.show" /></span></a>
+	<div id="additionalOptionsArea" style="display: none;" class="panel-body">
 		<div class="form-group">
-    	<label for="summary"><fmt:message key="label.common.summary" /></label>
-    	<label for="summary"><fmt:message key="label.common.summary" />&nbsp;
-		<html:select property="summary"  styleClass="form-control">
-			<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
-			<html:option value="2" ><fmt:message key="label.common.summary.average" /></html:option>
-			<html:option value="3" ><fmt:message key="label.common.summary.count" /></html:option>
-		</html:select>
+			<div class="checkbox">
+			    <label>
+		 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+			    </label>
+		 	</div>
 		</div>
-		<div class="checkbox">
-		    <label>
-	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
-		    </label>
-	  	</div>
-	  	</div>
-	</div>
+		<div class="form-group">
+    	<label for="summary"><fmt:message key="label.common.summary" /></label>: 
+			<html:select property="summary"  styleClass="form-control-inline input-sm">
+				<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
+				<html:option value="2" ><fmt:message key="label.common.summary.average" /></html:option>
+				<html:option value="3" ><fmt:message key="label.common.summary.count" /></html:option>
+			</html:select>
+		</div>
+ 	</div>
+
  	<!--  end options -->
 
  </html:form>
Index: lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp
===================================================================
diff -u -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678 -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	(.../addtextarea.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
+++ lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	(.../addtextarea.jsp)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -37,20 +37,20 @@
 	<%@ include file="description.jsp"%>
  
    	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	<div id="additionalOptionsArea" style="display: none;" class="voffset5">
- 		<div class="form-inline">
- 		<div class="form-group">
-    	<label for="max"><fmt:message key="label.authoring.basic.max.word" /></label>
- 		<html:text styleId="max" property="max" size="10"  styleClass="form-control"/>
-		</div>
-		<div class="checkbox">
-		    <label>
-	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
-		    </label>
+	<a href="javascript:toggleAdditionalOptionsArea()" class="fa-xs"><i id="faIcon" class="fa fa-plus-square-o"></i> <span id="toggleAdditionalOptionsAreaLink"><fmt:message key="label.authoring.basic.additionaloptions.show" /></span></a>
+	<div id="additionalOptionsArea" style="display: none;" class="panel-body">
+ 		<div class="form-group form-inline">
+			<div class="checkbox">
+			    <label>
+		 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+			    </label>
 	  	</div>
-	  	</div>
-	</div>
+		</div>
+ 		<div class="form-group form-inline">
+    	<label for="max"><fmt:message key="label.authoring.basic.max.word" />:</label>
+	 		<html:text styleId="max" property="max" size="10"  styleClass="form-control"/>
+		</div>	  	
+ </div>
  	<!--  end options -->
   	
 </html:form>
Index: lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp
===================================================================
diff -u -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678 -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	(.../addtextfield.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
+++ lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	(.../addtextfield.jsp)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -38,19 +38,19 @@
 	<%@ include file="description.jsp"%>
   	
   	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	<div id="additionalOptionsArea" style="display: none;" class="voffset5">
- 		<div class="form-inline">
- 		<div class="form-group">
-    	<label for=max><fmt:message key="label.authoring.basic.max.char" /></label>
-		<html:text styleId="max" property="max" size="10"  styleClass="form-control"/>
-		</div>
-		<div class="checkbox">
+	<a href="javascript:toggleAdditionalOptionsArea()" class="fa-xs"><i id="faIcon" class="fa fa-plus-square-o"></i> <span id="toggleAdditionalOptionsAreaLink"><fmt:message key="label.authoring.basic.additionaloptions.show" /></span></a>
+	<div id="additionalOptionsArea" style="display: none;" class="panel-body">
+		<div class="form-group form-inline">
+			<div class="checkbox">
 		    <label>
 	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
 		    </label>
 	  	</div>
-	  	</div>
+	  </div>
+		<div class="form-group form-inline">
+	   	<label for=max><fmt:message key="label.authoring.basic.max.char" />: </label>
+			<html:text styleId="max" property="max" size="10"  styleClass="form-control input-sm"/>
+		</div>
 	</div>
  	<!--  end options -->
   			
Index: lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp
===================================================================
diff -u -r6854efc3a6b7ee1041958f1a50d62116feb0bf2f -rd807f27e2bf8be3c24ccae85aa4b260c27aa2d25
--- lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp	(.../answeroptions.jsp)	(revision 6854efc3a6b7ee1041958f1a50d62116feb0bf2f)
+++ lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp	(.../answeroptions.jsp)	(revision d807f27e2bf8be3c24ccae85aa4b260c27aa2d25)
@@ -19,7 +19,7 @@
 	<c:forEach var="item" items="${answerOptionList}" varStatus="status">
 		<tr>
 			<td width="3px">${fn:substring(ordinal,status.index,status.index+1)})</td>
-			<td><input type="text" name="answerOptionItemDesc${status.index+1}" id="answerOptionItemDesc${status.index+1}" size="60" value="<c:out  value='${item}'/>" class="form-control"></td>
+			<td><input type="text" name="answerOptionItemDesc${status.index+1}" id="answerOptionItemDesc${status.index+1}" size="60" value="<c:out  value='${item}'/>" class="form-control input-sm"></td>
 
 			<td class="arrows">
 			<!-- Don't display up icon if first line -->