Index: lams_tool_daco/web/pages/authoring/basic.jsp
===================================================================
diff -u -r13f99a174c448a17a9c79e8089e76a70f4c3714d -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 13f99a174c448a17a9c79e8089e76a70f4c3714d)
+++ lams_tool_daco/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -98,7 +98,7 @@
 	<option><fmt:message key="label.authoring.basic.dropdown"/></option>
 	<option><fmt:message key="label.authoring.basic.checkbox"/></option>
 	<option><fmt:message key="label.authoring.basic.longlat"/></option>
-</select><html:link href="#" styleClass="btn btn-default btn-sm" onclick="javascript:showQuestionInputAreaByType('${showMessageURL }')">
+</select><html:link href="#" styleClass="btn btn-default btn-sm loffset5" onclick="javascript:showQuestionInputAreaByType('${showMessageURL }')">
 	<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.question.add" />
 </html:link></p></div>
 <a name="questionInputAreaAnchor"></a>
Index: lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp
===================================================================
diff -u -rb06bfc55f834d109bdc49deba23633fec403cfa4 -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	(.../addcheckbox.jsp)	(revision b06bfc55f834d109bdc49deba23633fec403cfa4)
+++ lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	(.../addcheckbox.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -40,7 +40,9 @@
 	<%@ include file="description.jsp"%>
 
 	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="visible-xs-block visible-lg-block btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<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">
 		<div class="form-group">
@@ -66,7 +68,6 @@
 	  	</div>
 	  	</div>
 	</div>
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="visible-sm-block visible-md-block btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
  	<!--  end options -->
   
 </html:form>
Index: lams_tool_daco/web/pages/authoring/parts/adddate.jsp
===================================================================
diff -u -rb06bfc55f834d109bdc49deba23633fec403cfa4 -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/parts/adddate.jsp	(.../adddate.jsp)	(revision b06bfc55f834d109bdc49deba23633fec403cfa4)
+++ lams_tool_daco/web/pages/authoring/parts/adddate.jsp	(.../adddate.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -35,7 +35,7 @@
 	<%@ include file="description.jsp"%>
 
 	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<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="checkbox">
 		    <label>
Index: lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp
===================================================================
diff -u -rb06bfc55f834d109bdc49deba23633fec403cfa4 -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision b06bfc55f834d109bdc49deba23633fec403cfa4)
+++ lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -40,7 +40,7 @@
 	<%@ include file="description.jsp"%>
   
   	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<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">
 		<div class="form-group">
Index: lams_tool_daco/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -rb06bfc55f834d109bdc49deba23633fec403cfa4 -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision b06bfc55f834d109bdc49deba23633fec403cfa4)
+++ lams_tool_daco/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -37,7 +37,7 @@
 	<%@ include file="description.jsp"%>
   
 	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<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="checkbox">
 		    <label>
Index: lams_tool_daco/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -rb06bfc55f834d109bdc49deba23633fec403cfa4 -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision b06bfc55f834d109bdc49deba23633fec403cfa4)
+++ lams_tool_daco/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -37,7 +37,7 @@
 	<%@ include file="description.jsp"%>
   
 	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<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="checkbox">
 		    <label>
@@ -55,4 +55,4 @@
 </div>
 
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp
===================================================================
diff -u -rb06bfc55f834d109bdc49deba23633fec403cfa4 -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision b06bfc55f834d109bdc49deba23633fec403cfa4)
+++ lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -40,7 +40,7 @@
 	<%@ include file="description.jsp"%>
   
 	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<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">
 		<div class="checkbox">
Index: lams_tool_daco/web/pages/authoring/parts/addnumber.jsp
===================================================================
diff -u -rb06bfc55f834d109bdc49deba23633fec403cfa4 -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	(.../addnumber.jsp)	(revision b06bfc55f834d109bdc49deba23633fec403cfa4)
+++ lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	(.../addnumber.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -37,19 +37,21 @@
 	<%@ include file="description.jsp"%>
   
   	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="visible-xs-block visible-lg-block btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	<div id="additionalOptionsArea" style="display: none;">
+	<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="10" styleClass="form-control"/>
+    	<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="10" styleClass="form-control"/>
+    	<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>
+    	<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>
@@ -64,7 +66,6 @@
 	  	</div>
 	  	</div>
 	</div>	
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="visible-sm-block visible-md-block btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
  	<!--  end options -->
   
  </html:form>
Index: lams_tool_daco/web/pages/authoring/parts/addradio.jsp
===================================================================
diff -u -rb06bfc55f834d109bdc49deba23633fec403cfa4 -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/parts/addradio.jsp	(.../addradio.jsp)	(revision b06bfc55f834d109bdc49deba23633fec403cfa4)
+++ lams_tool_daco/web/pages/authoring/parts/addradio.jsp	(.../addradio.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -40,7 +40,7 @@
 	<%@ include file="description.jsp"%>
 
   	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<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">
 		<div class="form-group">
Index: lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp
===================================================================
diff -u -rb06bfc55f834d109bdc49deba23633fec403cfa4 -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	(.../addtextarea.jsp)	(revision b06bfc55f834d109bdc49deba23633fec403cfa4)
+++ lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	(.../addtextarea.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -37,8 +37,8 @@
 	<%@ include file="description.jsp"%>
  
    	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	<div id="additionalOptionsArea" style="display: none;">
+	<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>
Index: lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp
===================================================================
diff -u -rb06bfc55f834d109bdc49deba23633fec403cfa4 -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	(.../addtextfield.jsp)	(revision b06bfc55f834d109bdc49deba23633fec403cfa4)
+++ lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	(.../addtextfield.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -38,8 +38,8 @@
 	<%@ include file="description.jsp"%>
   	
   	<!--  Options -->  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
-	<div id="additionalOptionsArea" style="display: none;">
+	<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>
@@ -57,6 +57,7 @@
 </html:form>
 
 <c:set var="addButtonMessageKey" value="label.authoring.basic.textfield.add" />
+<br/>
 <%@ include file="buttons.jsp"%>
 
 </div>
Index: lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp
===================================================================
diff -u -r756d63ed6f0fe8da2cbd61b5420f49def38d7590 -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp	(.../answeroptions.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
+++ lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp	(.../answeroptions.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -4,11 +4,11 @@
 <c:set var="listSize" value="${fn:length(answerOptionList)}" />
 <c:set var="ordinal"><fmt:message key="label.authoring.basic.answeroption.ordinal"/></c:set>
 
-<div id="answerOptionsArea" class="voffset5">
+<div id="answerOptionsArea" class="voffset10">
 <form id="answerOptionsForm"><input type="hidden" id="answerOptionCount" name="answerOptionCount" value="${listSize}"/>
 
 <div class="form-group"><label><fmt:message key="label.authoring.basic.answeroption" /></label>
-<a href="#" onclick="javascript:addAnswerOption()" class="btn btn-default btn-xs loffset5">
+<a href="#nogo" onclick="javascript:addAnswerOption()" class="btn btn-default btn-xs loffset5">
 	<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.answeroption.add" />
 </a>
 
@@ -48,4 +48,4 @@
 <%-- This script will adjust question input area height according to the new answer option count. --%>
 <!-- <script type="text/javascript">
 	resizeQuestionInputArea ();
-</script> -->
\ No newline at end of file
+</script> -->
Index: lams_tool_daco/web/pages/authoring/parts/buttons.jsp
===================================================================
diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -r06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678
--- lams_tool_daco/web/pages/authoring/parts/buttons.jsp	(.../buttons.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
+++ lams_tool_daco/web/pages/authoring/parts/buttons.jsp	(.../buttons.jsp)	(revision 06e6b8fb8c7d55d3ec6443788d8c5a9af1c4b678)
@@ -1,6 +1,4 @@
 <div class="voffset5">
-    <div><br /></div>
-    <div><br /></div>
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="btn btn-default btn-xs pull-right"> <fmt:message key="${addButtonMessageKey}" /> </a>
+	<a href="#" onclick="javascript:submitDacoQuestion()" class="btn btn-default btn-xs pull-right loffset5"> <fmt:message key="${addButtonMessageKey}" /> </a> 
 	<a href="#" onclick="javascript:cancelDacoQuestion()" class="btn btn-default btn-xs loffset5 pull-right"> <fmt:message key="label.common.cancel" /> </a>
 </div>