Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
diff -u -r3bc514681593b0694c54d0c77da015388362c196 -r98a737b94aeecc8cb04ebd47b5dee8b470ef7eea
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 3bc514681593b0694c54d0c77da015388362c196)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 98a737b94aeecc8cb04ebd47b5dee8b470ef7eea)
@@ -722,7 +722,7 @@
 	    if (StringUtils.isEmpty(contentType)
 		    || !(contentType.equals("image/gif") || contentType.equals("image/png")
 			    || contentType.equals("image/jpg") || contentType.equals("image/jpeg") || contentType
-			    .equals("image/pjpeg"))) {
+			    .equals("image/pjpeg") || contentType.equals("image/x-png"))) {
 		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
 			ImageGalleryConstants.ERROR_MSG_NOT_ALLOWED_FORMAT));
 	    }
Index: lams_tool_images/web/includes/javascript/thickbox.js
===================================================================
diff -u -r0f6fefcd6c8a98859a9d673514968eabeed70348 -r98a737b94aeecc8cb04ebd47b5dee8b470ef7eea
--- lams_tool_images/web/includes/javascript/thickbox.js	(.../thickbox.js)	(revision 0f6fefcd6c8a98859a9d673514968eabeed70348)
+++ lams_tool_images/web/includes/javascript/thickbox.js	(.../thickbox.js)	(revision 98a737b94aeecc8cb04ebd47b5dee8b470ef7eea)
@@ -127,9 +127,16 @@
 			}
 			// End Resizing
 			
-			TB_WIDTH = imageWidth + 50;
-			TB_HEIGHT = imageHeight + 80;
-			$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'>	<iframe id='TB_Image' style='border:0px;' frameborder='no' src='"+url+"' width='"+eval(imageWidth + 20)+"' height='"+eval(imageHeight + 20)+"'/></iframe></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>"); 		
+			TB_WIDTH = imageWidth + 30;
+			TB_HEIGHT = imageHeight + 60;
+
+			alert(imgPreloader.width);
+			alert(imgPreloader.height);
+			if ((imgPreloader.width > x) ||(imgPreloader.height > y)) {
+				$("#TB_window").append("<iframe id='TB_Image' style='border:0px;' frameborder='no' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"'/></iframe>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>");
+			} else {
+				$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>");				
+			}
 		
 			$("#TB_closeWindowButton").click(tb_remove);
 			
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -rb713ba2015fa5dd8d2c888e27699217b033ee397 -r98a737b94aeecc8cb04ebd47b5dee8b470ef7eea
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b713ba2015fa5dd8d2c888e27699217b033ee397)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 98a737b94aeecc8cb04ebd47b5dee8b470ef7eea)
@@ -140,6 +140,13 @@
 			$('#votingForm').ajaxSubmit(options);
 			return false;
 		});		
+
+		//to prevent scroll bars overlapping
+		//var nav = navigator.appName;
+		//if (nav == "Microsoft Internet Explorer") {
+			//alert(parent.document.getElementById("contentFrame").width);
+			//parent.document.getElementById("contentFrame").width = "2000px";
+		//}
 	});
 
 	<!--
@@ -274,7 +281,7 @@
    
 </lams:head>
 <body class="stripes">
-	<div id="content" >
+	<div id="content">
 
 		<%--ImageGallery information-----------------------------------%>