Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp
===================================================================
diff -u -rb6d9cc3b373ee8a9b7b9be20c821f337538beec4 -ra5066a096ea1309cc0e3e57ed9828818326ccb40
--- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision b6d9cc3b373ee8a9b7b9be20c821f337538beec4)
+++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision a5066a096ea1309cc0e3e57ed9828818326ccb40)
@@ -87,11 +87,13 @@
     marker.highlight = false;
     marker.removeLink = "<a href='javascript:removeMarker(" + markers.length + ")'><fmt:message key='button.remove'/></a>" ;
    	marker.editLink = "<a href='javascript:editMarker(" + markers.length + ")'><fmt:message key='button.edit'/></a>";
-   	marker.saveLink = "<a href='javascript:saveMarkerInfo(" + markers.length + ");'><fmt:message key='button.save'/></a>";
+   	marker.saveFuncStr = "saveMarkerInfo(" + markers.length + ");";
+   	marker.saveLink = "<a href='javascript:" +marker.saveFuncStr+ "'><fmt:message key='button.save'/></a>";
    	marker.cancelLink = "<a href='javascript:cancelEditMarkerInfo(" + markers.length + ")'><fmt:message key='button.cancel'/></a>";
     updateMarkerInfoWindowHtml(marker);
     markers[markers.length] = marker;
     
+    if (!isSaved) {openInfoWindow(markers.length - 1);}
 }
 
 function addUserToList(id, name)
@@ -313,7 +315,8 @@
 	if (markerIn.editingOn)
 	{
 		markerIn.linksBar = "<br/ >" + markerIn.saveLink + "&nbsp;" + markerIn.cancelLink;
-		markerIn.inputForm ="<fmt:message key='label.authoring.basic.title'/><br><input type='text' maxlength='50' size='50' id='markerTitle' name='markerTitle' value='" + markerIn.title +"' /><br>";
+		markerIn.inputForm ="<fmt:message key='label.authoring.basic.title'/>"
+		markerIn.inputForm += "<br><input type='text' onkeypress='javascript:if (event.keyCode==13){" +markerIn.saveFuncStr+ "}' maxlength='50' size='50' id='markerTitle' name='markerTitle' value='" + markerIn.title +"' /><br>";
 		markerIn.inputForm += "<fmt:message key='label.newInfoWindowText'/><br><textarea id='infoWindow' name='infoWindow' rows='5' cols='50'>" + markerIn.infoMessage + "</textarea>";
 		markerIn.markerMetaData = "<font size='tiny' color='grey'>";
 		markerIn.markerMetaData += '<nobr><fmt:message key="label.latitudeLongitude"/> (' + markerIn.getPoint().lat() + "-" + markerIn.getPoint().lng() +")</nobr>";
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -r2c4300753b3ced341b670f0224d47c66dba338b1 -ra5066a096ea1309cc0e3e57ed9828818326ccb40
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 2c4300753b3ced341b670f0224d47c66dba338b1)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a5066a096ea1309cc0e3e57ed9828818326ccb40)
@@ -31,8 +31,8 @@
 			<div id="map_canvas" style="width: 500px; height: 300px"></div> 
 			-->
 			<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>
+			<tr><td><div id="map_canvas" style="width: 400px; height: 400px;" ><fmt:message key="error.cantLoadMap"></fmt:message></div></td>
+			<td><div id="sidebar" style="width:100px; overflow:auto; height:400px; 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>
@@ -45,7 +45,7 @@
 			<div class="field-name">
 				<fmt:message key="label.authoring.basic.centerMap"></fmt:message>
 			</div>
-			<input type="text" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
+			<input type="text" size="60" onkeypress="javascript:if (event.keyCode==13){showAddress(); return false;}" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
        		<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
 		</td>
 	</tr>
@@ -59,7 +59,7 @@
 	if (GBrowserIsCompatible()) 
 	{
 		//map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(640,320) } );
-		map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(500,320) } );
+		map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(500,400) } );
     	map.addControl(new GLargeMapControl());
     	map.addControl(new GMapTypeControl());
     	map.addMapType(G_PHYSICAL_MAP); 
Index: lams_tool_gmap/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -rbaf5d2db55e5db78d24d07464b301c0568762607 -ra5066a096ea1309cc0e3e57ed9828818326ccb40
--- lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision baf5d2db55e5db78d24d07464b301c0568762607)
+++ lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision a5066a096ea1309cc0e3e57ed9828818326ccb40)
@@ -169,7 +169,7 @@
 						<br />
 						<table>
 						<tr><td>
-							<input type="text" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
+							<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress(); return false;}" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
 					 		<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
 						</td></tr>
 						</table>
Index: lams_tool_gmap/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rbaf5d2db55e5db78d24d07464b301c0568762607 -ra5066a096ea1309cc0e3e57ed9828818326ccb40
--- lams_tool_gmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision baf5d2db55e5db78d24d07464b301c0568762607)
+++ lams_tool_gmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision a5066a096ea1309cc0e3e57ed9828818326ccb40)
@@ -44,7 +44,7 @@
 
 <table>
 <tr><td>
-	<input type="text" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
+	<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress(); return false;}" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
 		<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
 </td></tr>
 </table>