Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
===================================================================
diff -u -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb -rf89d4cdd9372cf33b62ae45d3a7b9d4100f4f6b3
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision f89d4cdd9372cf33b62ae45d3a7b9d4100f4f6b3)
@@ -60,14 +60,6 @@
 import org.lamsfoundation.lams.web.util.SessionMap;
 
 /**
- * @author
- * @version
- *
- *
- *
- *
- *
- *
  */
 public class AuthoringAction extends LamsDispatchAction {
 
@@ -371,7 +363,6 @@
 	    HttpServletResponse response) {
 
 	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
-	;
 
 	// set up pixlrService
 	if (pixlrService == null) {
Index: lams_tool_pixlr/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb -rf89d4cdd9372cf33b62ae45d3a7b9d4100f4f6b3
--- lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
+++ lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision f89d4cdd9372cf33b62ae45d3a7b9d4100f4f6b3)
@@ -8,6 +8,11 @@
 
 <script type="text/javascript">
 	function validate() {
+		//in case image is already uploaded - skip validation
+		if ("${imageExists}" == "true") {
+			return true;
+		}
+		
 		// Get the selected files from the input.
 		var files = document.getElementById('file').files;
 		if (files.length == 0) {
Index: lams_tool_pixlr/web/pages/authoring/basic.jsp
===================================================================
diff -u -r3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b -rf89d4cdd9372cf33b62ae45d3a7b9d4100f4f6b3
--- lams_tool_pixlr/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b)
+++ lams_tool_pixlr/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision f89d4cdd9372cf33b62ae45d3a7b9d4100f4f6b3)
@@ -32,29 +32,27 @@
     	<fmt:message key="label.authoring.basic.instructions"/>
     </label>
 	<lams:CKEditor id="instructions" value="${formBean.instructions}"
-			contentFolderID="${sessionMap.contentFolderID}">
-	</lams:CKEditor>
+			contentFolderID="${sessionMap.contentFolderID}"/>
 </div>
 
 <div class="form-group">			
-			<c:choose>
-				<c:when test='${imageExists}'>
-					<div style="text-align:center;">
-						<img id="image" title="<fmt:message key="tooltip.openfullsize" />" 
-								onclick="openImage('${imageURL}')" src="${imageURL}"/>
-						<br>
+	<c:choose>
+		<c:when test='${imageExists}'>
+			<div style="text-align:center;">
+				<img id="image" title="<fmt:message key="tooltip.openfullsize" />" 
+						onclick="openImage('${imageURL}')" src="${imageURL}"/>
+				<br>
 				
-						<a href="javascript:submitForm('deleteImage')" class="btn btn-xs btn-default voffset10">
-							<fmt:message key="label.authoring.remove"/>
-						</a>
-					</div>
-				</c:when>
-				<c:otherwise>
-				    <lams:FileUpload fileFieldname="file" fileInputMessageKey="label.authoring.basic.add.image" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
-				</c:otherwise>
-			</c:choose>
+				<a href="javascript:submitForm('deleteImage')" class="btn btn-xs btn-default voffset10">
+					<fmt:message key="label.authoring.remove"/>
+				</a>
+			</div>
+		</c:when>
+		
+		<c:otherwise>
+		    <lams:FileUpload fileFieldname="file" fileInputMessageKey="label.authoring.basic.add.image" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
+		</c:otherwise>
+	</c:choose>
 </div>
 
-
 <lams:WaitingSpinner id="imageAttachmentDiv_Busy"/>
-