Index: lams_central/web/css/components.css
===================================================================
diff -u -rc9082cb1277cf7c0199ee4edb7d02f1358d037cd -r3d7577122201e05495a07b77e10a0846400987f0
--- lams_central/web/css/components.css	(.../components.css)	(revision c9082cb1277cf7c0199ee4edb7d02f1358d037cd)
+++ lams_central/web/css/components.css	(.../components.css)	(revision 3d7577122201e05495a07b77e10a0846400987f0)
@@ -99,10 +99,6 @@
 	color: #696f7d;
 }
 
-.content {
-	
-}
-
 .content-left {
 	-ms-flex: 0 0 26.5rem;
 	flex: 0 0 26.5rem;
@@ -237,9 +233,7 @@
 .bbox_body input.form-control {
 	border: 0.1rem solid #DFDCE9;
 	border-radius: 1rem;
-	height: 3.25rem;
 	color: black;
-	margin-bottom: .5rem;
 	font-size: 1rem;
 }
 
@@ -417,6 +411,7 @@
 	user-select: none;
 	vertical-align: middle;
 	text-indent: calc(calc(calc(2.375rem * .8) * 2) + .5rem);
+	margin-bottom: 0;
 }
 
 .switch input ~ label::before, .switch input ~ label::after {
@@ -520,10 +515,6 @@
 	margin-left: 1rem;
 }
 
-.dropdown-menu {
-	margin-top: .75rem;
-}
-
 .collapsable-icon-left:after {
 	font-family: FontAwesome;
 	content: "\f078";
Index: lams_tool_assessment/web/WEB-INF/tags/Input.tag
===================================================================
diff -u -r023e019feae586433ba4b9086294aab7a424d1f9 -r3d7577122201e05495a07b77e10a0846400987f0
--- lams_tool_assessment/web/WEB-INF/tags/Input.tag	(.../Input.tag)	(revision 023e019feae586433ba4b9086294aab7a424d1f9)
+++ lams_tool_assessment/web/WEB-INF/tags/Input.tag	(.../Input.tag)	(revision 3d7577122201e05495a07b77e10a0846400987f0)
@@ -17,7 +17,7 @@
 <%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
 
-<c:set var="inputCellClass" value=" ${empty inputCellClass ? 'd-flex justify-content-end' : inputCellClass}" />
+<c:set var="inputCellClass" value="${empty inputCellClass ? 'd-flex justify-content-end' : inputCellClass}" />
 <c:set var="labelCellSize" value="${empty labelCellSize ? 8 : labelCellSize}" />
 
 <div class="form-group row">
@@ -35,7 +35,7 @@
 		</c:if>
 	</label>
 	
-    <div class="col-sm-${12 - labelCellSize} ${inputCellClass}">
+    <div class="col-sm-${12 - labelCellSize} col-form-label ${inputCellClass}">
     	<jsp:doBody />
     </div>
 </div>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u -rd7f424400c50929787c8ab297872383cf34d3260 -r3d7577122201e05495a07b77e10a0846400987f0
--- lams_tool_assessment/web/WEB-INF/tags/Panel.tag	(.../Panel.tag)	(revision d7f424400c50929787c8ab297872383cf34d3260)
+++ lams_tool_assessment/web/WEB-INF/tags/Panel.tag	(.../Panel.tag)	(revision 3d7577122201e05495a07b77e10a0846400987f0)
@@ -22,47 +22,44 @@
 <%-- Should left panel (icon, color) be displayed at all --%>
 <c:set var="hasLeftPanel" value="${not empty icon or not empty iconClass or not empty colorClass}" />
 
-<div class="col-12 p-0">
-	<div class="bbox-col d-flex slide_col" id="${id}-bbox">
+<div class="bbox-col d-flex" id="${id}-bbox">
+	<c:if test="${hasLeftPanel}">
+		<div class="bbox-left ${colorClass}">
+			<c:choose>
+				<c:when test="${not empty icon}">
+					<%-- Display regular icon --%>
+					<img src="${icon}">
+				</c:when>
+				<c:when test="${not empty iconClass}">
+					<%-- Display Font Awesome icon --%>
+					<i class="fa ${iconClass}" aria-hidden="true"></i>
+				</c:when>
+				<c:otherwise>
+					<%-- Blank character for padding --%>
+					<span class="no-icon" aria-hidden="true">&nbsp;</span>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</c:if>
 	
-		<c:if test="${hasLeftPanel}">
-			<div class="bbox-left ${colorClass}">
-				<c:choose>
-					<c:when test="${not empty icon}">
-						<%-- Display regular icon --%>
-						<img src="${icon}">
-					</c:when>
-					<c:when test="${not empty iconClass}">
-						<%-- Display Font Awesome icon --%>
-						<i class="fa ${iconClass}" aria-hidden="true"></i>
-					</c:when>
-					<c:otherwise>
-						<%-- Blank character for padding --%>
-						<span class="no-icon" aria-hidden="true">&nbsp;</span>
-					</c:otherwise>
-				</c:choose>
-			</div>
-		</c:if>
+	<div class="bbox_body ${hasLeftPanel ? 'bbox-right' : ''}">
+           <div class="grey_title grey_title1">
+           	<c:set var="contentId" value="${id}-content" />
+           	<a class="collapsible-link ${empty titleKey ? ' no-title' : ''}" role="button" href="#${contentId}"
+           	   data-toggle="collapse" data-target="#${contentId}" aria-expanded="${expanded}" aria-controls="${contentId}">
+          	   		<c:choose>
+          	   			<c:when test="${not empty titleKey}">
+          	   				<h2><fmt:message key="${titleKey}" /></h2>
+          	   			</c:when>
+          	   			<c:otherwise>
+          	   				&nbsp;
+          	   			</c:otherwise>
+          	   		</c:choose>
+           	</a>
+		</div>
 		
-		<div class="bbox_body ${hasLeftPanel ? 'bbox-right' : ''}">
-            <div class="grey_title grey_title1">
-            	<c:set var="contentId" value="${id}-content" />
-            	<a class="collapsible-link ${empty titleKey ? ' no-title' : ''}" role="button" href="#${contentId}"
-            	   data-toggle="collapse" data-target="#${contentId}" aria-expanded="${expanded}" aria-controls="${contentId}">
-           	   		<c:choose>
-           	   			<c:when test="${not empty titleKey}">
-           	   				<h2><fmt:message key="${titleKey}" /></h2>
-           	   			</c:when>
-           	   			<c:otherwise>
-           	   				&nbsp;
-           	   			</c:otherwise>
-           	   		</c:choose>
-            	</a>
-			</div>
-			
-			<div id="${id}-content" class="row mt-3 collapse ${expanded ? ' show' : ''}">
-				<jsp:doBody />
-			</div>
+		<div id="${id}-content" class="row mt-3 collapse ${expanded ? ' show' : ''}">
+			<jsp:doBody />
 		</div>
 	</div>
 </div>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/authoring/authoring5.jsp
===================================================================
diff -u -r023e019feae586433ba4b9086294aab7a424d1f9 -r3d7577122201e05495a07b77e10a0846400987f0
--- lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 023e019feae586433ba4b9086294aab7a424d1f9)
+++ lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 3d7577122201e05495a07b77e10a0846400987f0)
@@ -149,43 +149,45 @@
 		<form:hidden path="sessionMapID" />
 		<form:hidden path="contentFolderID" />
 
-        <div class="container-fluid" style="max-width: 1600px">
-			<div id="content" class="content row">
-				<lams:Panel id="basic" titleKey="label.authoring.heading.basic" iconClass="fa-file-o" colorClass="green">
-					<div class="col-12 p-0">
-						 <jsp:include page="basic5.jsp"/>
-					</div>
-				</lams:Panel>
-					
-               	<lams:Panel id="questions" titleKey="label.authoring.basic.question.list.title" iconClass="fa-question-circle-o" colorClass="yellow" expanded="true">
-					<jsp:include page="questions5.jsp"/>
-				</lams:Panel>
+        <div id="content">
+			<lams:Panel id="basic" titleKey="label.authoring.heading.basic" iconClass="fa-file-o" colorClass="green">
+				<div class="col-12 p-0">
+					 <jsp:include page="basic5.jsp"/>
+				</div>
+			</lams:Panel>
 				
-				<lams:Panel id="advanced" titleKey="label.authoring.heading.advance" iconClass="fa-gear" colorClass="purple" expanded="false">
-					<jsp:include page="advance5.jsp"/>
-				</lams:Panel>
-				
-				<lams:Panel id="leader-selection" titleKey="label.select.leader" iconClass="fa-star-o" colorClass="yellow" expanded="false">
-					<jsp:include page="leader5.jsp"/>
-				</lams:Panel>
-				
-				<lams:Panel id="feedback" titleKey="label.authoring.basic.general.feedback" iconClass="fa-comment-o" colorClass="blue" expanded="false">
-					<jsp:include page="feedback5.jsp"/>
-				</lams:Panel>
-								
-				<lams:Panel id="reflection" titleKey="label.activity.completion"  icon="${lamsUrl}images/components/assess-icon7.svg"
-							colorClass="green2" expanded="false">
-					<jsp:include page="reflection5.jsp"/>
-				</lams:Panel>
-			</div>
+              	<lams:Panel id="questions" titleKey="label.authoring.basic.question.list.title" iconClass="fa-question-circle-o" colorClass="yellow" expanded="true">
+				<jsp:include page="questions5.jsp"/>
+			</lams:Panel>
 			
-			<!-- Button Row -->
-			<lams:AuthoringButton formID="authoringForm"
-				clearSessionActionUrl="/clearsession.do" toolSignature="<%=AssessmentConstants.TOOL_SIGNATURE%>"
-				toolContentID="${assessmentForm.assessment.contentId}"
-				accessMode="${mode}" defineLater="${mode=='teacher'}"
-				contentFolderID="${assessmentForm.contentFolderID}" />
-		</div>    
+			<lams:Panel id="advanced" titleKey="label.authoring.heading.advance" iconClass="fa-gear" colorClass="purple" expanded="false">
+				<jsp:include page="advance5.jsp"/>
+			</lams:Panel>
+			
+			<lams:Panel id="leader-selection" titleKey="label.select.leader" iconClass="fa-star-o" colorClass="yellow" expanded="false">
+				<jsp:include page="leader5.jsp"/>
+			</lams:Panel>
+			
+			<lams:Panel id="feedback" titleKey="label.authoring.basic.general.feedback" iconClass="fa-comment-o" colorClass="blue" expanded="false">
+				<jsp:include page="feedback5.jsp"/>
+			</lams:Panel>
+							
+			<lams:Panel id="reflection" titleKey="label.activity.completion"  icon="${lamsUrl}images/components/assess-icon7.svg"
+						colorClass="green2" expanded="false">
+				<jsp:include page="reflection5.jsp"/>
+			</lams:Panel>
+		</div>
+		
+		<!-- Button Row -->
+		<div class="row">
+			<div class="col-12 p-0">
+				<lams:AuthoringButton formID="authoringForm"
+					clearSessionActionUrl="/clearsession.do" toolSignature="<%=AssessmentConstants.TOOL_SIGNATURE%>"
+					toolContentID="${assessmentForm.assessment.contentId}"
+					accessMode="${mode}" defineLater="${mode=='teacher'}"
+					contentFolderID="${assessmentForm.contentFolderID}" />
+			</div>
+		</div>
 	</form:form>
 </lams:PageComponent>
 </body>