Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml
===================================================================
diff -u -r5d9ada1b3b139591dc6f1fffec04990beb727522 -rea01084a256b16e755ba6953267255776d63fb27
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml	(.../ImageGallery.hbm.xml)	(revision 5d9ada1b3b139591dc6f1fffec04990beb727522)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml	(.../ImageGallery.hbm.xml)	(revision ea01084a256b16e755ba6953267255776d63fb27)
@@ -189,14 +189,6 @@
         />
 
         <property
-            name="numberColumns"
-            type="int"
-            update="true"
-            insert="true"
-            column="number_columns"
-        />
-
-        <property
             name="allowVote"
             type="boolean"
             update="true"
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java
===================================================================
diff -u -r4b9aac6879339e46cb0a163a8f72400aed80c041 -rea01084a256b16e755ba6953267255776d63fb27
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java	(.../ImageGalleryItem.java)	(revision 4b9aac6879339e46cb0a163a8f72400aed80c041)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java	(.../ImageGalleryItem.java)	(revision ea01084a256b16e755ba6953267255776d63fb27)
@@ -26,9 +26,11 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 
 /**
  * ImageGallery
@@ -82,7 +84,14 @@
     public ImageGalleryItem() {
 	comments = new HashSet();
     }    
+    
+    // *************** NON Persist Fields (used only for export needs) ********************
+    private ImageGalleryAttachment originalFile;
 
+    private ImageGalleryAttachment mediumFile;
+
+    private ImageGalleryAttachment thumbnailFile;
+
     @Override
     public Object clone() {
 	ImageGalleryItem image = null;
@@ -356,4 +365,30 @@
     public void setNumberRatings(int numberRatings) {
 	this.numberRatings = numberRatings;
     }
+    
+    // *************** NON Persist Fields (used only for export needs) ********************
+    
+    public ImageGalleryAttachment getOriginalFile() {
+	return originalFile;
+    }
+
+    public void setOriginalFile(ImageGalleryAttachment originalFile) {
+	this.originalFile = originalFile;
+    }
+    
+    public ImageGalleryAttachment getMediumFile() {
+	return mediumFile;
+    }
+
+    public void setMediumFile(ImageGalleryAttachment mediumFile) {
+	this.mediumFile = mediumFile;
+    }
+
+    public ImageGalleryAttachment getThumbnailFile() {
+	return thumbnailFile;
+    }
+
+    public void setThumbnailFile(ImageGalleryAttachment thumbnailFile) {
+	this.thumbnailFile = thumbnailFile;
+    }
 }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 -rea01084a256b16e755ba6953267255776d63fb27
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision ea01084a256b16e755ba6953267255776d63fb27)
@@ -107,9 +107,12 @@
  * 
  */
 public class ImageGalleryServiceImpl implements IImageGalleryService, ToolContentManager, ToolSessionManager,
-	ToolContentImport102Manager
-
-{
+	ToolContentImport102Manager {
+    
+    private final static String MEDIUM_FILENAME_PREFIX = "medium_";
+    
+    private final static String THUMBNAIL_FILENAME_PREFIX = "thumbnail_";
+    
     static Logger log = Logger.getLogger(ImageGalleryServiceImpl.class.getName());
 
     private ImageGalleryDAO imageGalleryDao;
@@ -642,7 +645,7 @@
 	    // Read the original image from the repository
 	    InputStream originalIS = imageGalleryToolContentHandler.getFileNode(nodeKey.getUuid()).getFile();
 	    InputStream mediumIS = ResizePictureUtil.resizePicture(originalIS, mediumImageDimensions);
-	    String mediumFileName = "medium_" + fileName.substring(0, fileName.indexOf('.')) + ".jpg";
+	    String mediumFileName = MEDIUM_FILENAME_PREFIX + fileName.substring(0, fileName.indexOf('.')) + ".jpg";
 	    NodeKey mediumNodeKey = imageGalleryToolContentHandler.uploadFile(mediumIS, mediumFileName,
 		    file.getContentType(), IToolContentHandler.TYPE_ONLINE);
 	    image.setMediumFileUuid(mediumNodeKey.getUuid());
@@ -653,7 +656,7 @@
 	    // Read the original image from the repository
 	    InputStream mediumIS2 = imageGalleryToolContentHandler.getFileNode(mediumNodeKey.getUuid()).getFile();
 	    InputStream thumbnailIS = ResizePictureUtil.resizePicture(mediumIS2, thumbnailImageDimensions);
-	    String thumbnailFileName = "thumbnail_" + fileName.substring(0, fileName.indexOf('.')) + ".jpg";
+	    String thumbnailFileName = THUMBNAIL_FILENAME_PREFIX + fileName.substring(0, fileName.indexOf('.')) + ".jpg";
 	    NodeKey thumbnailNodeKey = imageGalleryToolContentHandler.uploadFile(thumbnailIS, thumbnailFileName,
 		    file.getContentType(), IToolContentHandler.TYPE_ONLINE);
 	    image.setThumbnailFileUuid(thumbnailNodeKey.getUuid());
@@ -791,11 +794,35 @@
 	toolContentObj.setToolContentHandler(null);
 	toolContentObj.setOfflineFileList(null);
 	toolContentObj.setOnlineFileList(null);
+	Set<ImageGalleryItem> images = toolContentObj.getImageGalleryItems();
+	for (ImageGalleryItem image : images) {
+	    image.setComments(null);
+	    
+	    ImageGalleryAttachment originalFile = new ImageGalleryAttachment();
+	    originalFile.setFileUuid(image.getOriginalFileUuid());
+	    originalFile.setFileVersionId(image.getFileVersionId());
+	    originalFile.setFileName(image.getFileName());
+	    originalFile.setFileType(IToolContentHandler.TYPE_ONLINE);
+	    image.setOriginalFile(originalFile);
+	    
+	    ImageGalleryAttachment mediumFile = new ImageGalleryAttachment();
+	    mediumFile.setFileUuid(image.getMediumFileUuid());
+	    mediumFile.setFileVersionId(image.getFileVersionId());
+	    mediumFile.setFileName(MEDIUM_FILENAME_PREFIX + image.getFileName());
+	    mediumFile.setFileType(IToolContentHandler.TYPE_ONLINE);	    
+	    image.setMediumFile(mediumFile);
+
+	    ImageGalleryAttachment thumbnailFile = new ImageGalleryAttachment();
+	    thumbnailFile.setFileUuid(image.getThumbnailFileUuid());
+	    thumbnailFile.setFileVersionId(image.getFileVersionId());
+	    thumbnailFile.setFileName(THUMBNAIL_FILENAME_PREFIX + image.getFileName());
+	    thumbnailFile.setFileType(IToolContentHandler.TYPE_ONLINE);	    
+	    image.setThumbnailFile(thumbnailFile);
+	}
+	
 	try {
 	    exportContentService.registerFileClassForExport(ImageGalleryAttachment.class.getName(), "fileUuid",
 		    "fileVersionId");
-	    exportContentService.registerFileClassForExport(ImageGalleryItem.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, toolContentObj, imageGalleryToolContentHandler,
 		    rootPath);
 	} catch (ExportToolContentException e) {
@@ -809,14 +836,12 @@
 	try {
 	    exportContentService.registerFileClassForImport(ImageGalleryAttachment.class.getName(), "fileUuid",
 		    "fileVersionId", "fileName", "fileType", null, null);
-	    exportContentService.registerFileClassForImport(ImageGalleryItem.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, "initialItem");
 
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, imageGalleryToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof ImageGallery)) {
 		throw new ImportToolContentException(
-			"Import Share imageGallery tool content failed. Deserialized object is " + toolPOJO);
+			"Import ImageGallery tool content failed. Deserialized object is " + toolPOJO);
 	    }
 	    ImageGallery toolContentObj = (ImageGallery) toolPOJO;
 
@@ -836,9 +861,17 @@
 	    toolContentObj.setCreatedBy(user);
 
 	    // reset all imageGalleryItem createBy user
-	    Set<ImageGalleryItem> items = toolContentObj.getImageGalleryItems();
-	    for (ImageGalleryItem item : items) {
-		item.setCreateBy(user);
+	    Set<ImageGalleryItem> images = toolContentObj.getImageGalleryItems();
+	    for (ImageGalleryItem image : images) {
+		image.setCreateBy(user);
+		
+		image.setOriginalFileUuid(image.getOriginalFile().getFileUuid());
+		image.setMediumFileUuid(image.getMediumFile().getFileUuid());
+		image.setThumbnailFileUuid(image.getThumbnailFile().getFileUuid());
+		
+		image.setOriginalFile(null);
+		image.setMediumFile(null);
+		image.setThumbnailFile(null);
 	    }
 	    imageGalleryDao.saveObject(toolContentObj);
 	} catch (ImportToolContentException e) {
Index: lams_tool_images/web/includes/javascript/lightbox.js
===================================================================
diff -u -r2ded08a63789390122f15ab1c3c70075ed0d2a2e -rea01084a256b16e755ba6953267255776d63fb27
--- lams_tool_images/web/includes/javascript/lightbox.js	(.../lightbox.js)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
+++ lams_tool_images/web/includes/javascript/lightbox.js	(.../lightbox.js)	(revision ea01084a256b16e755ba6953267255776d63fb27)
@@ -272,7 +272,6 @@
 //
 function initLightbox()
 {
-	
 	if (!document.getElementsByTagName){ return; }
 	var anchors = document.getElementsByTagName("a");