Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -raa932dd995a61adeed918456c6257a4a9a9cea74 -ra082fc4c4f94c475538e6101ead7ceb316337fb3
--- lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision aa932dd995a61adeed918456c6257a4a9a9cea74)
+++ lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a082fc4c4f94c475538e6101ead7ceb316337fb3)
@@ -120,6 +120,7 @@
 label.monitoring.leader.not.changed = Leader was not changed
 label.authoring.basic.instructions.tooltip = If you want the students to have a template document to guide them on their collaborative response, add your template here.
 label.authoring.basic.description.tooltip = Description or case to be presented to students.
+label.time.limit.tooltip = Number of minutes that each student will get from the moment they enter this activity. Leave it at 0 for no time restrictions. 
 label.attendance = Attendance
 label.monitoring.summary.time.limit.individual.placeholder = Type name
 label.monitoring.summary.time.limit.finish.now.confirm = Are you sure you want to make all learners finish their work right now?
Index: lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -raa932dd995a61adeed918456c6257a4a9a9cea74 -ra082fc4c4f94c475538e6101ead7ceb316337fb3
--- lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision aa932dd995a61adeed918456c6257a4a9a9cea74)
+++ lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a082fc4c4f94c475538e6101ead7ceb316337fb3)
@@ -120,6 +120,7 @@
 label.monitoring.leader.not.changed = Leader was not changed
 label.authoring.basic.instructions.tooltip = If you want the students to have a template document to guide them on their collaborative response, add your template here.
 label.authoring.basic.description.tooltip = Description or case to be presented to students.
+label.time.limit.tooltip = Number of minutes that each student will get from the moment they enter this activity. Leave it at 0 for no time restrictions. 
 label.attendance = Attendance
 label.monitoring.summary.time.limit.individual.placeholder = Type name
 label.monitoring.summary.time.limit.finish.now.confirm = Are you sure you want to make all learners finish their work right now?
Index: lams_tool_doku/web/pages/authoring/advance.jsp
===================================================================
diff -u -r0ebaba46f0ce87b5138e8e70cc1965887c1c7787 -ra082fc4c4f94c475538e6101ead7ceb316337fb3
--- lams_tool_doku/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 0ebaba46f0ce87b5138e8e70cc1965887c1c7787)
+++ lams_tool_doku/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision a082fc4c4f94c475538e6101ead7ceb316337fb3)
@@ -42,9 +42,10 @@
 	<div class="form-inline">
 		<label for="relativeTimeLimit">
 			<fmt:message key="label.time.limit" />&nbsp;
-			<form:input path="dokumaran.relativeTimeLimit" type="number" min="0" size="3" id="relativeTimeLimit" cssClass="form-control input-sm"/>
+            <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="" data-original-title="<fmt:message key="label.time.limit.tooltip"/>"></i>
 		</label>
-	</div>
+        <form:input path="dokumaran.relativeTimeLimit" type="number" min="0" size="2" id="relativeTimeLimit" cssClass="form-control input-sm"/>        
+    </div>
 	
 	<div class="checkbox">
 		<label for="showChat">
Index: lams_tool_doku/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r8e8e7b3f0982e5e772b90202f01d43f1ee52962d -ra082fc4c4f94c475538e6101ead7ceb316337fb3
--- lams_tool_doku/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8e8e7b3f0982e5e772b90202f01d43f1ee52962d)
+++ lams_tool_doku/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision a082fc4c4f94c475538e6101ead7ceb316337fb3)
@@ -8,7 +8,7 @@
 	<%@ include file="/common/tabbedheader.jsp"%>
 	
 	<style>
-		#timeLimit {
+		#relativeTimeLimit {
 			width: 70px;
 		}
 		
Index: lams_tool_doku/web/pages/authoring/basic.jsp
===================================================================
diff -u -ra64a48ee2c188e9192a2811978dc4635173135f0 -ra082fc4c4f94c475538e6101ead7ceb316337fb3
--- lams_tool_doku/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a64a48ee2c188e9192a2811978dc4635173135f0)
+++ lams_tool_doku/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a082fc4c4f94c475538e6101ead7ceb316337fb3)
@@ -9,14 +9,17 @@
 </div>
 
 <div class="form-group">
-    <label for="dokumaran.description"><fmt:message key="label.authoring.basic.description" /></label>
-    <lams:CKEditor id="dokumaran.description" value="${authoringForm.dokumaran.description}" contentFolderID="${authoringForm.contentFolderID}"/>
+    <label for="dokumaran.description"><fmt:message key="label.authoring.basic.description" />&nbsp;
+        <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="" data-original-title="<fmt:message key="label.authoring.basic.description.tooltip"/>"></i>
+    </label>
+    <lams:CKEditor id="dokumaran.description" value="${authoringForm.dokumaran.description}" height="220" contentFolderID="${authoringForm.contentFolderID}"/>
 </div>
 
 
 <div class="form-group">
     <label for="dokumaran.instructions">
-    	<fmt:message key="label.authoring.basic.instruction" />
+    	<fmt:message key="label.authoring.basic.instruction" />&nbsp;
+        <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="" data-original-title="<fmt:message key="label.authoring.basic.instructions.tooltip"/>"></i>        
     </label>
-    <lams:CKEditor id="dokumaran.instructions" value="${authoringForm.dokumaran.instructions}" contentFolderID="${authoringForm.contentFolderID}" height="400" toolbarSet="DefaultDoku" method="inline"/>
+    <lams:CKEditor id="dokumaran.instructions" value="${authoringForm.dokumaran.instructions}" contentFolderID="${authoringForm.contentFolderID}" height="220" toolbarSet="DefaultDoku" method="inline"/>
 </div>