Index: lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u -ra92b50b99f081e14a2af12a814e6760bcedc3db6 -r967256b088ed091ec9bfd98b25bdb6028879827f
--- lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag	(.../Dropdown.tag)	(revision a92b50b99f081e14a2af12a814e6760bcedc3db6)
+++ lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag	(.../Dropdown.tag)	(revision 967256b088ed091ec9bfd98b25bdb6028879827f)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
 
 <%@ attribute name="name" required="true" rtexprvalue="true" %>
@@ -21,33 +22,17 @@
 <c:set var="id" value="${empty id ? name : id}" />
 <c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
 
-<div class="form-group row">
-	<label class="col-sm-8 col-form-label" for="${id}">
-		<fmt:message key="${labelKey}" />
-		
-		<c:if test="${not empty tooltipKey}">
-			<a tabindex="0" role="button" data-toggle="tooltip" title="<fmt:message key='${tooltipKey}' />">
-				<i class="info_icon fa fa-info-circle text-info fa-fw"
-					<c:if test="${not empty tooltipDescriptionKey}">
-						aria-label="<fmt:message key="${tooltipDescriptionKey}" />"
-					</c:if>
-				></i>
-			</a>
-		</c:if>
-	</label>
-	
-    <div class="col-sm-4 justify-content-end d-flex">
-    	<c:choose>
-    		<c:when test="${useSpringForm}">
-    			<form:select path="${name}" id="${id}" cssClass="form-control form-control-select" aria-label="<fmt:message key='${tooltipKey}' />">
-    				<jsp:doBody />
-    			</form:select>
-    		</c:when>
-    		<c:otherwise>
-    			<select name="${name}" id="${id}" class="form-control form-control-select" >
-            		<jsp:doBody />
-        		</select>
-    		</c:otherwise>
-    	</c:choose>
-    </div>
-</div>
\ No newline at end of file
+<lams:Input id="${id}" labelKey="${labelKey}" tooltipKey="${tooltipKey}" tooltipDescriptionKey="${tooltipDescriptionKey}">
+	<c:choose>
+   		<c:when test="${useSpringForm}">
+   			<form:select path="${name}" id="${id}" cssClass="form-control form-control-select" aria-label="<fmt:message key='${tooltipKey}' />">
+   				<jsp:doBody />
+   			</form:select>
+   		</c:when>
+   		<c:otherwise>
+   			<select name="${name}" id="${id}" class="form-control form-control-select" >
+           		<jsp:doBody />
+       		</select>
+   		</c:otherwise>
+   	</c:choose>
+</lams:Input>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/Input.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/Input.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/Input.tag	(revision 967256b088ed091ec9bfd98b25bdb6028879827f)
@@ -0,0 +1,37 @@
+<% 
+ /**
+  * Input.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled input widget
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<div class="form-group row">
+	<label class="col-sm-8 col-form-label" for="${id}">
+		<fmt:message key="${labelKey}" />
+		
+		<c:if test="${not empty tooltipKey}">
+			<a tabindex="0" role="button" data-toggle="tooltip" title="<fmt:message key='${tooltipKey}' />">
+				<i class="info_icon fa fa-info-circle text-info fa-fw"
+					<c:if test="${not empty tooltipDescriptionKey}">
+						aria-label="<fmt:message key="${tooltipDescriptionKey}" />"
+					</c:if>
+				></i>
+			</a>
+		</c:if>
+	</label>
+	
+    <div class="col-sm-4 justify-content-end d-flex ${inputCellClass}">
+    	<jsp:doBody />
+    </div>
+</div>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/Switch.tag
===================================================================
diff -u -ra92b50b99f081e14a2af12a814e6760bcedc3db6 -r967256b088ed091ec9bfd98b25bdb6028879827f
--- lams_tool_assessment/web/WEB-INF/tags/Switch.tag	(.../Switch.tag)	(revision a92b50b99f081e14a2af12a814e6760bcedc3db6)
+++ lams_tool_assessment/web/WEB-INF/tags/Switch.tag	(.../Switch.tag)	(revision 967256b088ed091ec9bfd98b25bdb6028879827f)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
 
 <%@ attribute name="name" required="true" rtexprvalue="true" %>
@@ -23,31 +24,15 @@
 <c:set var="id" value="${empty id ? name : id}" />
 <c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
 
-<div class="form-group row">
-	<label class="col-sm-8 col-form-label" for="${id}">
-		<fmt:message key="${labelKey}" />
-		
-		<c:if test="${not empty tooltipKey}">
-			<a tabindex="0" role="button" data-toggle="tooltip" title="<fmt:message key="${tooltipKey}" />">
-				<i class="info_icon fa fa-info-circle text-info fa-fw"
-					<c:if test="${not empty tooltipDescriptionKey}">
-						aria-label="<fmt:message key="${tooltipDescriptionKey}" />"
-					</c:if>
-				></i>
-			</a>
-		</c:if>
-		
-	</label>
-    <div class="col-sm-4 justify-content-end d-flex switch switch-sm">
-    	<c:choose>
-    		<c:when test="${useSpringForm}">
-    			<form:checkbox path="${name}" id="${id}" cssClass="switch" />
-    		</c:when>
-    		<c:otherwise>
-				<input type="checkbox" class="switch" name="${name}" id="${id}" ${checked ? ' checked' : ''}>
-    		</c:otherwise>
-    	</c:choose>
-		
-		<label for="${id}" />
-    </div>
-</div>					
\ No newline at end of file
+<lams:Input id="${id}" labelKey="${labelKey}" tooltipKey="${tooltipKey}" tooltipDescriptionKey="${tooltipDescriptionKey}" inputCellClass="switch switch-sm">
+    <c:choose>
+   		<c:when test="${useSpringForm}">
+   			<form:checkbox path="${name}" id="${id}" cssClass="switch" />
+   		</c:when>
+   		<c:otherwise>
+			<input type="checkbox" class="switch" name="${name}" id="${id}" ${checked ? ' checked' : ''}>
+   		</c:otherwise>
+   	</c:choose>
+	
+	<label for="${id}" />
+</lams:Input>			
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r4db761ac22cb30c958b4a1fc5e9cb6c1a9f42ff7 -r967256b088ed091ec9bfd98b25bdb6028879827f
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4db761ac22cb30c958b4a1fc5e9cb6c1a9f42ff7)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 967256b088ed091ec9bfd98b25bdb6028879827f)
@@ -425,4 +425,8 @@
 	    <name>Dropdown</name>
 		<path>/WEB-INF/tags/Dropdown.tag</path>
    	</tag-file> 
+   	<tag-file>
+	    <name>Input</name>
+		<path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file> 
 </taglib>