Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/AuthoringController.java
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -rd1f3bf74f099d80552eecac477aa993d23389a37
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision d1f3bf74f099d80552eecac477aa993d23389a37)
@@ -23,6 +23,7 @@
 
 package org.lamsfoundation.lams.tool.whiteboard.web.controller;
 
+import java.net.URLEncoder;
 import java.sql.Timestamp;
 import java.util.Date;
 
@@ -40,6 +41,7 @@
 import org.lamsfoundation.lams.tool.whiteboard.web.form.WhiteboardForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.CommonConstants;
+import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -110,12 +112,25 @@
 
 	try {
 	    whiteboard = whiteboardService.getWhiteboardByContentId(contentId);
+
 	    // if Whiteboard does not exist, try to use default content instead.
 	    if (whiteboard == null) {
 		whiteboard = whiteboardService.getDefaultContent(contentId);
 	    }
 
 	    authoringForm.setWhiteboard(whiteboard);
+
+	    String authorName = null;
+	    if (whiteboard.getCreatedBy() == null) {
+		HttpSession ss = SessionManager.getSession();
+		// get back login user DTO
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		authorName = user.getFirstName() + " " + user.getLastName();
+	    } else {
+		authorName = whiteboard.getCreatedBy().getFirstName() + " " + whiteboard.getCreatedBy().getLastName();
+	    }
+
+	    authoringForm.setAuthorName(URLEncoder.encode(authorName, FileUtil.ENCODING_UTF_8));
 	} catch (Exception e) {
 	    AuthoringController.log.error(e);
 	    throw new ServletException(e);
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/form/WhiteboardForm.java
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -rd1f3bf74f099d80552eecac477aa993d23389a37
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/form/WhiteboardForm.java	(.../WhiteboardForm.java)	(revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/form/WhiteboardForm.java	(.../WhiteboardForm.java)	(revision d1f3bf74f099d80552eecac477aa993d23389a37)
@@ -40,6 +40,7 @@
     private String mode;
 
     private Whiteboard whiteboard;
+    private String authorName;
 
     public WhiteboardForm() {
 	whiteboard = new Whiteboard();
@@ -98,4 +99,12 @@
     public void setMode(String mode) {
 	this.mode = mode;
     }
+
+    public String getAuthorName() {
+        return authorName;
+    }
+
+    public void setAuthorName(String authorName) {
+        this.authorName = authorName;
+    }
 }
\ No newline at end of file
Index: lams_tool_whiteboard/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -rd1f3bf74f099d80552eecac477aa993d23389a37
--- lams_tool_whiteboard/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision d1f3bf74f099d80552eecac477aa993d23389a37)
@@ -12,8 +12,11 @@
 			width: 70px;
 		}
 		
-		#timeLimitManualStartDiv {
-			margin: 0 0 25px 0;
+		#whiteboard-frame {
+			width: 100%;
+			height: 700px;
+			margin-bottom: 20px;
+			border: 1px solid #c1c1c1;
 		}
 	</style>
 	<script type="text/javascript">
@@ -78,12 +81,6 @@
 			</lams:TabBodys>
 				
 			<!-- Button Row -->
-			<%--  Default value 
-				cancelButtonLabelKey="label.authoring.cancel.button"
-				saveButtonLabelKey="label.authoring.save.button"
-				cancelConfirmMsgKey="authoring.msg.cancel.save"
-				accessMode="author"
-			--%>
 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
 				toolSignature="<%=WhiteboardConstants.TOOL_SIGNATURE%>" toolContentID="${authoringForm.whiteboard.contentId}" 
 				 customiseSessionID="${authoringForm.sessionMapID}" accessMode="${mode}" defineLater="${mode=='teacher'}"
Index: lams_tool_whiteboard/web/pages/authoring/basic.jsp
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -rd1f3bf74f099d80552eecac477aa993d23389a37
--- lams_tool_whiteboard/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision d1f3bf74f099d80552eecac477aa993d23389a37)
@@ -15,3 +15,7 @@
     </label>
     <lams:CKEditor id="whiteboard.instructions" value="${authoringForm.whiteboard.instructions}" contentFolderID="${authoringForm.contentFolderID}" />
 </div>
+
+<iframe id="whiteboard-frame"
+        src="http://localhost:9003?accesstoken=123&whiteboardid=${authoringForm.whiteboard.contentId}&username=${authoringForm.authorName}">
+</iframe>
\ No newline at end of file