Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
===================================================================
diff -u -rdee7a4bdcb678f343afc05c39e87e35b60714b96 -r6b2be5683ca90dbed1a439b6688a1c75bf18b76b
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision dee7a4bdcb678f343afc05c39e87e35b60714b96)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 6b2be5683ca90dbed1a439b6688a1c75bf18b76b)
@@ -199,8 +199,7 @@
 	} else {
 	    DokumaranUser leader = session.getGroupLeader();
 	    // check leader select tool for a leader only in case Dokumaran tool doesn't know it. As otherwise it will
-	    // screw
-	    // up previous scratches done
+	    // screw up previous scratches done
 	    if (leader == null) {
 
 		Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getUserId().intValue());
@@ -221,7 +220,9 @@
 		}
 	    }
 	    
-	    leaders.add(leader);
+	    if (leader != null) {
+		leaders.add(leader);
+	    }
 	}
 
 	return leaders;
@@ -292,7 +293,7 @@
 	int newTimeLimit;
 	if (checkTimeLimitExceeded(dokumaran)) {
 	    dokumaran.setTimeLimitLaunchedDate(new Date());
-	    newTimeLimit = 1;
+	    newTimeLimit = 1;//d
 	} else {
 	    newTimeLimit = timeLimit + 1;
 	}
Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -r47200ab94fd2651b62702c9e4f2eb6eb989a08c1 -r6b2be5683ca90dbed1a439b6688a1c75bf18b76b
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 47200ab94fd2651b62702c9e4f2eb6eb989a08c1)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 6b2be5683ca90dbed1a439b6688a1c75bf18b76b)
@@ -30,12 +30,9 @@
 			font-size: 170%; padding-top:5px; padding-bottom:5px; font-style: italic; color:#47bc23;
 		}
 		
-		<c:if test="${isTimeLimitEnabled}">
-		.panel-body.panel-learner-body {
-			padding-top: 70px;
+		.lower-to-fit-countdown {
+			margin-top: 70px;
 		}
-		</c:if>
-		
 	</style>
 
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
@@ -180,7 +177,8 @@
 
 		<%@ include file="/common/messages.jsp"%>
 
-		<div class="panel panel-default">			
+		<div class='panel panel-default 
+				<c:if test="${isTimeLimitEnabled}">lower-to-fit-countdown</c:if>'>			
 			<div id="etherpad-container"></div>
 			<div id="etherpad-containera"></div>
 			<div id="etherpad-containerb"></div>