Index: lams_tool_chat/web/includes/css/chat.css
===================================================================
diff -u -rc7020071c1f16ffd675388ff66fc89df55de41e3 -r3605a487dbf22d097f03ab539f1f4df98bdc2f49
--- lams_tool_chat/web/includes/css/chat.css	(.../chat.css)	(revision c7020071c1f16ffd675388ff66fc89df55de41e3)
+++ lams_tool_chat/web/includes/css/chat.css	(.../chat.css)	(revision 3605a487dbf22d097f03ab539f1f4df98bdc2f49)
@@ -19,14 +19,10 @@
 	margin-left: 4px;
 }
 
-#chat_pane {
-	width: 98%;
-}
-
 #iResp {
 	height: 260px;
 	margin-right: 12px;
-	overflow: scroll;
+	overflow: auto;
 	border-width: 1px;
 	border-style: solid;
 	padding: 2px;
@@ -36,13 +32,24 @@
 	float: right;
 	width: 105px;
 	height: 260px;
-	overflow: hidden;
+	overflow: auto;
 	border-width: 1px;
 	border-style: solid;
 	font-weight: bold;
 	padding: 2px;
 }
 
+#send-button {
+	float: right;
+	width: 105px;
+	overflow: auto;
+}
+	
+#send-message-area {
+	margin-right: 12px;
+	overflow: auto;
+}
+
 .selected {
 	background-color: #ececec;
 	padding: 2px;
Index: lams_tool_chat/web/includes/javascript/learning.js
===================================================================
diff -u -r6507889accce02f9e65102334afcae852270c79b -r3605a487dbf22d097f03ab539f1f4df98bdc2f49
--- lams_tool_chat/web/includes/javascript/learning.js	(.../learning.js)	(revision 6507889accce02f9e65102334afcae852270c79b)
+++ lams_tool_chat/web/includes/javascript/learning.js	(.../learning.js)	(revision 3605a487dbf22d097f03ab539f1f4df98bdc2f49)
@@ -91,10 +91,12 @@
 		sendToUserElem.appendChild(createElem("span", null, {color:getColour(user.nick)}, user.nick));
 		document.getElementById("sendToEveryone").style.display = "none";
 		document.getElementById("sendToUser").style.display = "";
-	} else {
-		document.getElementById("sendToUser").style.display = "none";
-		document.getElementById("sendToEveryone").style.display = "";
-	}
+	} 
+	
+	//else {
+	//	document.getElementById("sendToUser").style.display = "none";
+	//	document.getElementById("sendToEveryone").style.display = "";
+	//}
 }
 function Roster() {
 	this.users = [];
Index: lams_tool_chat/web/pages/learning/learning.jsp
===================================================================
diff -u -r0200bffbef212fe67c2f35c9cedf9b6392daf8bb -r3605a487dbf22d097f03ab539f1f4df98bdc2f49
--- lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0200bffbef212fe67c2f35c9cedf9b6392daf8bb)
+++ lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3605a487dbf22d097f03ab539f1f4df98bdc2f49)
@@ -43,46 +43,45 @@
 	<p>
 		<c:out value="${chatDTO.instructions}" escapeXml="false" />
 	</p>
-	
+
 	<div id="chat_content">
-		<div id="chat_pane">
-			<form name="sendForm" action="" onSubmit="return sendMsg(this);">
-				<div>
 
+		<form name="sendForm" action="" onSubmit="return sendMsg(this);">
+			<div>
 
-					<div id="roster"></div>
-					<div id="iResp">
-						<fmt:message>message.loading</fmt:message>
-					</div>
 
-					<br />
+				<div id="roster"></div>
+				<div id="iResp">
+					<fmt:message>message.loading</fmt:message>
+				</div>
 
+				<br />
+
+				<c:if test="${MODE == 'teacher' }">
 					<div class="field-name">
 						<fmt:message>label.sendMessageTo</fmt:message>
 						<span id="sendToEveryone"><fmt:message>label.everyone</fmt:message>
 						</span><span id="sendToUser" style="display: none"></span>
 					</div>
+				</c:if>
 
-
-					
-						<textarea name="msg" onKeyPress="return checkEnter(event);"
-							id="msgArea" rows="2" cols="20"></textarea>
-						
-						
-						<div class="space-top">
+				<div>
+					<div id="send-button" align="right">
 						<input id="sendButton" class="button" type="submit"
 							value='<fmt:message>button.send</fmt:message>' />
-						</div>
-					
-					
-				</div>
-			</form>
+					</div>
 
-			
-			<c:if test="${MODE == 'learner' || MODE == 'author'}">
-				<%@ include file="parts/finishButton.jsp"%>
-			</c:if>
-		</div>
+
+					<div id="send-message-area">
+						<textarea id="msgArea" name="msg"
+							onKeyPress="return checkEnter(event);" rows="2" cols="2"></textarea>
+					</div>
+				</div>
+			</div>
+		</form>
+		<c:if test="${MODE == 'learner' || MODE == 'author'}">
+			<%@ include file="parts/finishButton.jsp"%>
+		</c:if>
 	</div>
 </div>
 
Index: lams_tool_chat/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r0200bffbef212fe67c2f35c9cedf9b6392daf8bb -r3605a487dbf22d097f03ab539f1f4df98bdc2f49
--- lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 0200bffbef212fe67c2f35c9cedf9b6392daf8bb)
+++ lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 3605a487dbf22d097f03ab539f1f4df98bdc2f49)
@@ -2,8 +2,8 @@
 
 <c:if
 	test="${chatUserDTO.finishedActivity and chatDTO.reflectOnActivity}">
-	<div>
-		<h4 style="margin-left: 12px;">
+	<div class="space-top">
+		<h4>
 			${chatDTO.reflectInstructions}
 		</h4>
 		<p>
@@ -14,24 +14,23 @@
 
 <html:form action="/learning" method="post">
 	<html:hidden property="chatUserUID" value="${chatUserDTO.uid}" />
-	<c:choose>
-		<c:when
-			test="${!chatUserDTO.finishedActivity and chatDTO.reflectOnActivity}">
-			<html:hidden property="dispatch" value="openNotebook" />
+	<div align="right" class="space-bottom-top">
+		<c:choose>
+			<c:when
+				test="${!chatUserDTO.finishedActivity and chatDTO.reflectOnActivity}">
+				<html:hidden property="dispatch" value="openNotebook" />
 
-			<html:submit styleClass="button right-buttons">
-				<fmt:message key="button.continue" />
-			</html:submit>
+				<html:submit styleClass="button">
+					<fmt:message key="button.continue" />
+				</html:submit>
 
-		</c:when>
-		<c:otherwise>
-			<html:hidden property="dispatch" value="finishActivity" />
-
-			<div class="small-space-bottom" align="right">
+			</c:when>
+			<c:otherwise>
+				<html:hidden property="dispatch" value="finishActivity" />
 				<html:submit styleClass="button">
 					<fmt:message key="button.finish" />
 				</html:submit>
-			</div>
-		</c:otherwise>
-	</c:choose>
+			</c:otherwise>
+		</c:choose>
+	</div>
 </html:form>