Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
diff -u -rbaf5d2db55e5db78d24d07464b301c0568762607 -r2c4300753b3ced341b670f0224d47c66dba338b1
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision baf5d2db55e5db78d24d07464b301c0568762607)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 2c4300753b3ced341b670f0224d47c66dba338b1)
@@ -35,6 +35,8 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import javax.servlet.http.HttpSession;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.upload.FormFile;
@@ -82,6 +84,8 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * An implementation of the IGmapService interface.
@@ -298,6 +302,7 @@
 		gmap.setToolContentHandler(null);
 		gmap.setGmapSessions(null);
 		gmap.setCreateBy(null);
+		gmap.setToolContentHandler(null);
 		
 		Set<GmapAttachment> atts = gmap.getGmapAttachments();
 		for (GmapAttachment att : atts) {
@@ -354,7 +359,15 @@
 
 			// reset it to new toolContentId
 			gmap.setToolContentId(toolContentId);
-			gmap.setCreateBy(new Long(newUserUid.longValue()));
+			
+			// Create a user for gmap to be created by:
+			HttpSession ss = SessionManager.getSession();
+			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+			GmapUser gmapUser = new GmapUser(user,null);
+			gmapUserDAO.saveOrUpdate(gmapUser);
+			
+			gmap.setCreateBy(gmapUser.getUid());
+			//gmap.setCreateBy(new Long(newUserUid.longValue()));
 
 			gmapDAO.saveOrUpdate(gmap);
 		} catch (ImportToolContentException e) {
Index: lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js
===================================================================
diff -u -rbaf5d2db55e5db78d24d07464b301c0568762607 -r2c4300753b3ced341b670f0224d47c66dba338b1
--- lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js	(.../mapFunctionsAuthoring.js)	(revision baf5d2db55e5db78d24d07464b301c0568762607)
+++ lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js	(.../mapFunctionsAuthoring.js)	(revision 2c4300753b3ced341b670f0224d47c66dba338b1)
@@ -86,7 +86,7 @@
 		{
 			sideBarText += "<span id='markerSpan" +markers[i].sideBarIndex+ "'>";
 			sideBarText += "<a href='javascript:GEvent.trigger(markers[" + markers[i].sideBarIndex + "],\"click\")' ";
-			sideBarText += "title='" + markers[i].createdBy + "' >" + markers[i].title + "</a>"
+			sideBarText += "title='" + markers[i].title + "' >" + markers[i].title + "</a>"
 			sideBarText += "</span><br />";
 			//sideBarText += markers[i].sideBarLinkPrefix + " title='" + markers[i].createdBy + "' >" + markers[i].title+"</a></span><br />";
 		}
Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp
===================================================================
diff -u -rdd20ca6b8b6e277bbe8f327ca973ea17dc6dbb6b -r2c4300753b3ced341b670f0224d47c66dba338b1
--- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision dd20ca6b8b6e277bbe8f327ca973ea17dc6dbb6b)
+++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision 2c4300753b3ced341b670f0224d47c66dba338b1)
@@ -188,15 +188,15 @@
 	for (j=0;j<users.length; j++)
 	{
 		sideBarText += "<nobr><img src='" +TREE_CLOSED_ICON+ "' id='userTreeIcon" + users[j].id + "' onclick='javascript:makeUsersSideBarVisible(" + users[j].id + ");' />";
-		sideBarText += " <a href='javascript:showSelectedUser(" + users[j].id + ");'><span id='userSpan" + users[j].id +"'>" + users[j].name + "</span></a></nobr><br>";
+		sideBarText += " <a href='javascript:showSelectedUser(" + users[j].id + ");' title='" +users[j].name+ "'><span id='userSpan" + users[j].id +"'>" + users[j].name + "</span></a></nobr><br>";
 		sideBarText += "<div style='display:none;' id='userdiv" + users[j].id + "'>";
 		for (i=0;i<markers.length; i++)
 		{
 			if (markers[i].createdById == users[j].id)
 			{
 				sideBarText += "&nbsp;&nbsp;&nbsp;&nbsp;<span id='markerSpan" + markers[i].sideBarIndex + "'><nobr>";
 				sideBarText += "<a href='javascript:GEvent.trigger(markers[" + markers[i].sideBarIndex + "],\"click\");' ";
-				sideBarText += "title='" + markers[i].createdBy + "' >" + markers[i].title + "</a>"
+				sideBarText += "title='" + markers[i].title + "' >" + markers[i].title + "</a>"
 				sideBarText += "</span></nobr><br />";
 			}
 		}
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -r064aa8ed3beb9f465a4245ecb4d0d49ece36fa34 -r2c4300753b3ced341b670f0224d47c66dba338b1
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 064aa8ed3beb9f465a4245ecb4d0d49ece36fa34)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 2c4300753b3ced341b670f0224d47c66dba338b1)
@@ -32,7 +32,7 @@
 			-->
 			<table cellpadding='0' cellspacing='0' border='0'>
 			<tr><td><div id="map_canvas" style="width: 400px; height: 300px;" ><fmt:message key="error.cantLoadMap"></fmt:message></div></td>
-			<td><div id="sidebar" style="width:100px; overflow:auto;height:320px; background:WhiteSmoke; "></div></td></tr>
+			<td><div id="sidebar" style="width:100px; overflow:auto; height:320px; background:WhiteSmoke; "></div></td></tr>
 			<tr><td>
 			<a href="javascript:addMarkerToCenter()" class="button"/><fmt:message key="button.addMarker"/></a>
 			<a href="javascript:fitMapMarkers()" class="button"/><fmt:message key="button.fitMarkers"/></a>