Index: lams_admin/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_admin/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_central/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_gradebook/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_gradebook/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_gradebook/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_gradebook/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_gradebook/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_gradebook/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_gradebook/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_learning/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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/PageComponent.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_chat/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_daco/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_doku/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_forum/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_gmap/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_images/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_imscc/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_lamc/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_laqa/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_larsrc/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_leader/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_mindmap/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_nb/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_notebook/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_pixlr/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_preview/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_preview/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_preview/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_preview/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_preview/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_preview/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_preview/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_sbmt/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_scratchie/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_scribe/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_spreadsheet/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_survey/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_task/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_vote/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_whiteboard/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_whiteboard/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_whiteboard/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_whiteboard/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_whiteboard/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_wiki/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_zoom/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_zoom/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_zoom/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_tool_zoom/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_tool_zoom/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_tool_zoom/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_tool_zoom/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/Dropdown.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,40 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ 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" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+<c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
+
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
+			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_www/web/WEB-INF/tags/PageComponent.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/PageComponent.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/PageComponent.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,29 @@
+<% 
+ /**
+  * PageComponent.tag
+  *	Author: Marcin Cieslak
+  *	Description: Wrap contents in a standardised page template
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+
+<div class="component-page-wrapper d-flex">
+		<div class="component-page-content">
+            <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+            
+            <c:if test="${not empty titleKey}">
+				<header class="header d-flex justify-content-between">
+					<div class="header-col d-flex">
+						<h1><fmt:message key="${titleKey}" /></h1>
+					</div>
+				</header>
+			</c:if>
+			
+			<jsp:doBody />
+			
+		</div>
+</div>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/Panel.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/Panel.tag	(revision 8bdaa44b23569a15fbc49b391c9d8f103b53efc9)
@@ -0,0 +1,76 @@
+<% 
+ /**
+  * Panel.tag
+  *	Author: Marcin Cieslak
+  *	Description: Show a collapsible panel with decorations
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="collapsible" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
+
+<c:set var="collapsible" value="${empty collapsible ? true : collapsible}" />
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- 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="banner-box-col d-flex" id="${id}-banner-box">
+	<c:if test="${hasLeftPanel}">
+		<div class="banner-box-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="banner-box-body ${hasLeftPanel ? 'banner-box-right' : ''}">
+		<c:set var="contentId" value="${id}-content" />
+		
+		<c:if test="${collapsible or not empty titleKey}">
+	        <div class="banner-box-title">
+	           <c:if test="${collapsible}">
+		           	<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:if>
+	           	
+	   	   		<c:choose>
+	   	   			<c:when test="${not empty titleKey}">
+	   	   				<h2><fmt:message key="${titleKey}" /></h2>
+	   	   			</c:when>
+	   	   			<c:otherwise>
+	   	   				&nbsp;
+	   	   			</c:otherwise>
+	   	   		</c:choose>
+	   	   		
+	   	   		 <c:if test="${collapsible}">
+	           		</a>
+	           	</c:if>
+			</div>
+		</c:if>
+		
+		<div id="${contentId}" class="${collapsible ? 'mt-3 collapse' : ''} ${collapsible and expanded ? ' show' : ''}">
+			<jsp:doBody />
+		</div>
+	</div>
+</div>
\ No newline at end of file