diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IContentBlockManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IContentBlockManager.java
index 743148ce3..2360015e6 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IContentBlockManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IContentBlockManager.java
@@ -87,6 +87,10 @@ public interface IContentBlockManager {
      */
     void deleteSpaceBlockById(String blockId, String slideId) throws BlockDoesNotExistException;
     
+    void updateContentOrder(List<ContentBlock> contentBlockList, ISlide slide) throws BlockDoesNotExistException;
+
+    void saveVideoBlock(IVideoBlock videoBlock);
+
     /**
      * Adjusting the content order of the blocks of slide once it is dragged and
      * changed position.
@@ -96,7 +100,4 @@ public interface IContentBlockManager {
      */
     void updateContentOrder(List<ContentBlock> contentBlockList) throws BlockDoesNotExistException;
 
-    void saveVideoBlock(IVideoBlock videoBlock);
-    
-
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
index 7f7e0a84d..064084407 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
@@ -1,6 +1,7 @@
 package edu.asu.diging.vspace.core.services;
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.IExternalLink;
@@ -12,11 +13,11 @@
 public interface IExternalLinkManager extends ILinkManager<IExternalLink, ExternalLinkValue, IExternalLinkDisplay>{
 
     IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
-            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException;
+            String linkLabel, String desc, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen, String imageId)
+            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException, ImageDoesNotExistException;
 
     IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
-            String imageFilename,ExternalLinkDisplayMode howToOpen)
-            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
+            String linkLabel, String desc, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
+            String imageFilename, String existingImageId, ExternalLinkDisplayMode howToOpen)
+            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException;
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java
index b34febced..be7690f21 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java
@@ -3,26 +3,28 @@
 import java.util.List;
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.ILink;
 import edu.asu.diging.vspace.core.model.IVSpaceElement;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.ILinkDisplay;
 
 public interface ILinkManager<L extends ILink<T>, T extends IVSpaceElement, U extends ILinkDisplay> {
 
     U createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
-            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException;
+            String linkLabel, String linkDesc, DisplayType displayType, byte[] linkImage, String imageFilename,  String existingImageId)
+            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException, ImageDoesNotExistException;
 
     U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
-            String imageFilename)
-            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
+            String linkLabel, String linkDesc, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
+            String imageFilename, String existingImageId)
+            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException;
 
     List<U> getLinkDisplays(String spaceId);
 
     void deleteLink(String linkId);
 
-}
+}
\ No newline at end of file
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManager.java
index 872e12ddf..f0b2fbab0 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManager.java
@@ -14,6 +14,7 @@
 
 import edu.asu.diging.vspace.core.data.BiblioBlockRepository;
 import org.springframework.transaction.annotation.Transactional;
+
 import edu.asu.diging.vspace.core.data.ChoiceContentBlockRepository;
 import edu.asu.diging.vspace.core.data.ContentBlockRepository;
 import edu.asu.diging.vspace.core.data.ImageContentBlockRepository;
@@ -57,6 +58,7 @@
 import edu.asu.diging.vspace.core.model.impl.VideoBlock;
 import edu.asu.diging.vspace.core.services.IContentBlockManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
+import edu.asu.diging.vspace.core.services.impl.CreationReturnValue;
 
 @Transactional(rollbackFor = { Exception.class })
 @Service
@@ -273,7 +275,9 @@ public CreationReturnValue createVideoBlock(String slideId, byte[] video, Long s
     private IVSVideo storeVideo(byte[] video, Long size, String fileName, String url, String title)
             throws VideoCouldNotBeStoredException {
         IVSVideo slideContentVideo = null;
+        
         if (video != null) {
+            
             slideContentVideo = saveVideo(video, size, fileName, title);
             storeVideoFile(video, slideContentVideo, fileName);
             slideContentVideo.setUrl(null);
@@ -589,12 +593,13 @@ public Integer findMaxContentOrder(String slideId) {
      *                         content order corresponding to each blocks.
      */
     @Override
-    public void updateContentOrder(List<ContentBlock> contentBlockList) throws BlockDoesNotExistException {
+    public void updateContentOrder(List<ContentBlock> contentBlockList, ISlide slide) throws BlockDoesNotExistException {
         if (contentBlockList == null) {
             return;
         }
         List<ContentBlock> contentBlocks = new ArrayList<>();
         for (ContentBlock eachBlock : contentBlockList) {
+            eachBlock.setSlide(slide);
             String blockId = eachBlock.getId();
             int contentOrder = eachBlock.getContentOrder();
             Optional<ContentBlock> contentBlock = contentBlockRepository.findById(blockId);
@@ -609,6 +614,24 @@ public void updateContentOrder(List<ContentBlock> contentBlockList) throws Block
         contentBlockRepository.saveAll(contentBlocks);
     }
 
+    /**
+     * Adjusting the content order of the blocks of slide once it is dragged and
+     * changed position.
+     * 
+     * @param contentBlockList - The list contains the blocks and the updated
+     *                         content order corresponding to each blocks.
+     */
+    @Override
+    public void updateContentOrder(List<ContentBlock> contentBlockList) throws BlockDoesNotExistException {
+        if (contentBlockList == null || contentBlockList.isEmpty()) {
+            return;
+        }
+        
+        // Get the slide from the first content block
+        ISlide slide = contentBlockList.get(0).getSlide();
+        updateContentOrder(contentBlockList, slide);
+    }
+
     /**
      * Decreasing content order by 1 of the slide's block which are after the
      * specified contentOrder
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
index 33cd4fb4a..e55dfc531 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
@@ -28,7 +28,7 @@
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
-
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 @Transactional
 @Service
 public class ExternalLinkManager extends LinkManager<IExternalLink, ExternalLinkValue, IExternalLinkDisplay>
@@ -49,15 +49,6 @@ public class ExternalLinkManager extends LinkManager<IExternalLink, ExternalLink
     @Autowired
     private IExternalLinkDisplayFactory externalLinkDisplayFactory;
 
-    @Autowired
-    private IImageFactory imageFactory;
-
-    @Autowired
-    private ImageRepository imageRepo;
-
-    @Autowired
-    private IStorageEngine storage;
-
     @Override
     public List<IExternalLinkDisplay> getLinkDisplays(String spaceId) {
         return externalLinkDisplayRepo.findExternalLinkDisplaysForSpace(spaceId);
@@ -121,9 +112,10 @@ protected void deleteLinkRepo(IExternalLink link) {
 
     @Override
     public IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation,
-            String linkedId, String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,
-            ExternalLinkDisplayMode howToOpen)
-            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException {
+            String linkedId, String linkLabel, String desc, DisplayType displayType, byte[] linkImage, String imageFilename,
+            ExternalLinkDisplayMode howToOpen, String imageId )
+            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException, ImageDoesNotExistException {
+
 
         /*
          * When createLink is called then inside updateLinkAndDisplay(link, displayLink)
@@ -133,7 +125,7 @@ public IExternalLinkDisplay createLink(String title, String id, float positionX,
          * automatically persist howToOpen in database.
          */
         IExternalLinkDisplay externalLinkDisplay = createLink(title, id, positionX, positionY, rotation, linkedId,
-                linkLabel, displayType, linkImage, imageFilename);
+                linkLabel, desc, displayType, linkImage, imageFilename, imageId);
         externalLinkDisplay.setHowToOpen(howToOpen);
         return externalLinkDisplay;
 
@@ -141,9 +133,9 @@ public IExternalLinkDisplay createLink(String title, String id, float positionX,
 
     @Override
     public IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation,
-            String linkedId, String linkLabel, String linkId, String linkDisplayId, DisplayType displayType,
-            byte[] linkImage, String imageFilename, ExternalLinkDisplayMode howToOpen)
-            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
+            String linkedId, String linkLabel, String desc, String linkId, String linkDisplayId, DisplayType displayType,
+            byte[] linkImage, String imageFilename, String existingImageId,  ExternalLinkDisplayMode howToOpen)
+            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException {
 
         /*
          * When updateLink is called then inside updateLinkAndDisplay(link, displayLink)
@@ -153,9 +145,9 @@ public IExternalLinkDisplay updateLink(String title, String id, float positionX,
          * automatically persist howToOpen in database.
          */
         IExternalLinkDisplay externalLinkDisplay = updateLink(title, id, positionX, positionY, rotation, linkedId,
-                linkLabel, linkId, linkDisplayId, displayType, linkImage, imageFilename);
+                linkLabel, desc, linkId, linkDisplayId, displayType, linkImage, imageFilename, existingImageId);
         externalLinkDisplay.setHowToOpen(howToOpen);
         return externalLinkDisplay;
     }
 
-}
+}
\ No newline at end of file
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
index 9bf7870fe..5fff6f105 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
@@ -16,11 +16,13 @@
 import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.IVSpaceElement;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.ILinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.VSImage;
+import edu.asu.diging.vspace.core.services.IImageService;
 import edu.asu.diging.vspace.core.services.ILinkManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
-
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 @Transactional
 public abstract class LinkManager<L extends ILink<T>, T extends IVSpaceElement, U extends ILinkDisplay>
         implements ILinkManager<L, T, U> {
@@ -36,37 +38,66 @@ public abstract class LinkManager<L extends ILink<T>, T extends IVSpaceElement,
 
     @Autowired
     private IStorageEngine storage;
+    
+    @Autowired
+    private IImageService imageService;
+
+    protected abstract void deleteLinkRepo(L link);
+
+    protected abstract void deleteLinkDisplayRepo(L link);
+
+    protected abstract void removeFromLinkList(ISpace space, L link);
+
+    protected abstract U updateLinkAndDisplay(L link, U displayLink);
+
+    protected abstract U getDisplayLink(String linkDisplayId) throws LinkDoesNotExistsException;
+
+    protected abstract L getLink(String linkId);
+
+    protected abstract L createLinkObject(String title, String id);
 
+    protected abstract T getTarget(String linkedId);
+
+    protected abstract U createDisplayLink(L link);
+    
     @Override
     public U createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
-            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException {
+            String linkLabel, String linkDesc, DisplayType displayType, byte[] linkImage, String imageFilename, String existingImageId)
+            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException, ImageDoesNotExistException {
 
         L link = createLinkObject(title, id);
         T target = getTarget(linkedId);
         link.setName(linkLabel);
+        link.setDescription(linkDesc);
         link.setTarget(target);
         U displayLink = createDisplayLink(link);
-        setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
+        if(existingImageId!=null && !existingImageId.trim().isEmpty()) {
+            setDisplayProperties(displayLink, positionX, positionY, rotation, displayType, existingImageId);
+        } else {
+            setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
+        }
         return updateLinkAndDisplay(link, displayLink);
 
     }
 
     @Override
     public U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
-            String imageFilename)
-            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
-
+            String linkLabel, String linkDesc, String linkId,  String linkDisplayId, DisplayType displayType, byte[] linkImage,
+            String imageFilename, String existingImageId)
+            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException {
         validateSpace(id);
-
         L link = getLink(linkId);
         T target = getTarget(linkedId);
         link.setName(title);
+        link.setDescription(linkDesc);
         link.setTarget(target);
         U displayLink = getDisplayLink(linkDisplayId);
-        setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
-        return updateLinkAndDisplay(link, displayLink);
+        if(existingImageId!=null && !existingImageId.trim().isEmpty()) {
+            setDisplayProperties(displayLink, positionX, positionY, rotation, displayType, existingImageId);
+        } else {
+            setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
+        }
+        return updateLinkAndDisplay(link,displayLink);        
     }
 
     @Override
@@ -77,38 +108,26 @@ public void deleteLink(String linkId) {
         deleteLinkRepo(link);
     }
 
-    protected abstract void deleteLinkRepo(L link);
-
-    protected abstract void deleteLinkDisplayRepo(L link);
-
-    protected abstract void removeFromLinkList(ISpace space, L link);
-
-    protected abstract U updateLinkAndDisplay(L link, U displayLink);
-
-    protected abstract U getDisplayLink(String linkDisplayId) throws LinkDoesNotExistsException;
-
-    protected abstract L getLink(String linkId);
-
-    protected abstract L createLinkObject(String title, String id);
-
-    protected abstract T getTarget(String linkedId);
-
-    protected abstract U createDisplayLink(L link);
-
     protected void validateSpace(String id) throws SpaceDoesNotExistException {
         ISpace source = spaceManager.getSpace(id);
         if (source == null) {
             throw new SpaceDoesNotExistException();
         }
     }
+    
+    protected void setLinkDisplay(ILinkDisplay linkDisplay, float positionX, float positionY, int rotation, DisplayType displayType) {
+    	linkDisplay.setPositionX(positionX);
+        linkDisplay.setPositionY(positionY);
+        linkDisplay.setRotation(rotation);
+        linkDisplay.setType(displayType != null ? displayType : DisplayType.ARROW);   	
+    }
 
     protected void setDisplayProperties(ILinkDisplay linkDisplay, String id, float positionX, float positionY,
             int rotation, DisplayType displayType, byte[] linkImage, String imageFilename)
             throws ImageCouldNotBeStoredException {
-        linkDisplay.setPositionX(positionX);
-        linkDisplay.setPositionY(positionY);
-        linkDisplay.setRotation(rotation);
-        linkDisplay.setType(displayType != null ? displayType : DisplayType.ARROW);
+    	
+    	setLinkDisplay(linkDisplay, positionX, positionY, rotation, displayType);
+    	
         if (linkImage != null && linkImage.length > 0) {
             Tika tika = new Tika();
             String contentType = tika.detect(linkImage);
@@ -125,4 +144,15 @@ protected void setDisplayProperties(ILinkDisplay linkDisplay, String id, float p
             linkDisplay.setImage(image);
         }
     }
+    
+    protected void setDisplayProperties(ILinkDisplay linkDisplay, float positionX, float positionY, int rotation, 
+    		DisplayType displayType, String existingImageId) throws ImageCouldNotBeStoredException, ImageDoesNotExistException {
+    	setLinkDisplay(linkDisplay, positionX, positionY, rotation, displayType);
+        if(existingImageId!=null && !existingImageId.trim().isEmpty()) {
+            IVSImage image = imageService.getImageById(existingImageId);
+            linkDisplay.setImage(image);
+        }
+
+    }
+
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java
index 297143ead..686643e54 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java
@@ -387,5 +387,4 @@ public int getTotalSpaceCount(String searchTerm) {
             return (int) spaceRepo.count();
         }
     }
-    
 }
\ No newline at end of file
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java
index daa3bb8da..130636cc5 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
@@ -38,16 +39,26 @@ public class AddExternalLinkController {
     public ResponseEntity<String> createExternalLink(@PathVariable("id") String id, @RequestParam("x") String x,
             @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
             @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
-            @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file)
-            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException {
+            @RequestParam("type") String displayType, @RequestParam(value="externalLinkImage", required=false) MultipartFile file,
+            @RequestParam(value="externalLink-imageId", required=false) String imageId)
+            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException, ImageDoesNotExistException {
 
         ISpace space = spaceManager.getSpace(id);
+        String desc = "";
         if (space == null) {
             return new ResponseEntity<>("{'error': 'Space could not be found.'}", HttpStatus.NOT_FOUND);
         }
 
         byte[] linkImage = null;
         String filename = null;
+        
+        if (file == null && imageId == null) {
+            ObjectMapper mapper = new ObjectMapper();
+            ObjectNode node = mapper.createObjectNode();
+            node.put("errorMessage", "No image provided for space link.");
+            return new ResponseEntity<String>(mapper.writeValueAsString(node), HttpStatus.BAD_REQUEST);
+        }
+        
         if (file != null) {
             linkImage = file.getBytes();
             filename = file.getOriginalFilename();
@@ -56,7 +67,8 @@ public ResponseEntity<String> createExternalLink(@PathVariable("id") String id,
         ExternalLinkDisplayMode externalLinkOpenMode = howToOpen.isEmpty() ? null
                 : ExternalLinkDisplayMode.valueOf(howToOpen);
         IExternalLinkDisplay display = externalLinkManager.createLink(title, id, new Float(x), new Float(y), 0,
-                externalLink, title, type, linkImage, filename, externalLinkOpenMode);
+                externalLink, title, desc, type, linkImage, filename, externalLinkOpenMode, imageId);
+        
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode linkNode = mapper.createObjectNode();
         linkNode.put("id", display.getExternalLink().getId());
@@ -67,4 +79,4 @@ public ResponseEntity<String> createExternalLink(@PathVariable("id") String id,
 
         return new ResponseEntity<>(mapper.writeValueAsString(linkNode), HttpStatus.OK);
     }
-}
+}
\ No newline at end of file
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddModuleLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddModuleLinkController.java
index ed767d769..a97c2560d 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddModuleLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddModuleLinkController.java
@@ -11,7 +11,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
-
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -33,12 +33,14 @@ public class AddModuleLinkController {
     private IModuleLinkManager moduleLinkManager;
 
     @RequestMapping(value = "/staff/space/{id}/modulelink", method = RequestMethod.POST)
-    public ResponseEntity<String> createModuleLink(@PathVariable("id") String id, @RequestParam("x") String x,
-            @RequestParam("y") String y, @RequestParam("rotation") String rotation,
-            @RequestParam("moduleLinkLabel") String title, @RequestParam("linkedModule") String linkedModuleId,
-            @RequestParam("moduleLinkLabel") String moduleLinkLabel, @RequestParam("moduleType") String displayType,
-            @RequestParam("moduleLinkImage") MultipartFile file)
-            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException {
+	public ResponseEntity<String> createModuleLink(@PathVariable("id") String id, @RequestParam("x") String x,
+		@RequestParam("y") String y, @RequestParam("rotation") String rotation,
+		@RequestParam("moduleLinkLabel") String title, @RequestParam("linkedModule") String linkedModuleId,
+		@RequestParam("moduleLinkLabel") String moduleLinkLabel,
+		@RequestParam(value = "moduleLinkDesc", required = false) String moduleLinkDesc, @RequestParam("moduleType") String displayType,
+		@RequestParam(value = "moduleLinkImage", required = false) MultipartFile file,
+		@RequestParam(value = "module-imageId", required = false) String imageId)
+	    throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException, ImageDoesNotExistException {
 
         ISpace source = spaceManager.getSpace(id);
         if (source == null) {
@@ -51,6 +53,13 @@ public ResponseEntity<String> createModuleLink(@PathVariable("id") String id, @R
             node.put("errorMessage", "No link coordinates specified.");
             return new ResponseEntity<String>(mapper.writeValueAsString(node), HttpStatus.BAD_REQUEST);
         }
+        
+        if (file == null && (imageId == null || imageId.equals(""))) {
+            ObjectMapper mapper = new ObjectMapper();
+            ObjectNode node = mapper.createObjectNode();
+            node.put("errorMessage", "No image provided for space link.");
+            return new ResponseEntity<String>(mapper.writeValueAsString(node), HttpStatus.BAD_REQUEST);
+        }
 
         byte[] linkImage = null;
         String filename = null;
@@ -63,7 +72,7 @@ public ResponseEntity<String> createModuleLink(@PathVariable("id") String id, @R
         IModuleLinkDisplay display;
         try {
             display = moduleLinkManager.createLink(title, id, new Float(x), new Float(y), new Integer(rotation),
-                    linkedModuleId, moduleLinkLabel, type, linkImage, filename);
+                      linkedModuleId, moduleLinkLabel, moduleLinkDesc, type, linkImage, filename, imageId);
         } catch (SpaceDoesNotExistException e) {
             ObjectMapper mapper = new ObjectMapper();
             ObjectNode node = mapper.createObjectNode();
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpaceLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpaceLinkController.java
index f9afa5799..e9af321c7 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpaceLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpaceLinkController.java
@@ -11,7 +11,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
-
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -37,10 +37,11 @@ public class AddSpaceLinkController {
     public ResponseEntity<String> createSpaceLink(@PathVariable("id") String id, @RequestParam("x") String x,
             @RequestParam("y") String y, @RequestParam("rotation") String rotation,
             @RequestParam("spaceLinkLabel") String title, @RequestParam("linkedSpace") String linkedSpaceId,
-            @RequestParam("spaceLinkLabel") String spaceLinkLabel, @RequestParam("type") String displayType,
-            @RequestParam("spaceLinkImage") MultipartFile file)
-            throws NumberFormatException, SpaceDoesNotExistException, IOException {
+            @RequestParam("spaceLinkLabel") String spaceLinkLabel, @RequestParam(value = "spaceLinkDesc", required=false) String spaceLinkDesc, @RequestParam("type") String displayType,
+            @RequestParam(value="spaceLinkImage", required=false) MultipartFile file, @RequestParam(value="space-imageId", required=false) String imageId)
+            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageDoesNotExistException {
 
+        
         ISpace source = spaceManager.getSpace(id);
         if (source == null) {
             return new ResponseEntity<>("{'error': 'Space could not be found.'}", HttpStatus.NOT_FOUND);
@@ -52,6 +53,13 @@ public ResponseEntity<String> createSpaceLink(@PathVariable("id") String id, @Re
             node.put("errorMessage", "No link coordinates specified.");
             return new ResponseEntity<String>(mapper.writeValueAsString(node), HttpStatus.BAD_REQUEST);
         }
+        
+        if (file == null && (imageId == null || imageId.equals(""))) {
+            ObjectMapper mapper = new ObjectMapper();
+            ObjectNode node = mapper.createObjectNode();
+            node.put("errorMessage", "No image provided for space link.");
+            return new ResponseEntity<String>(mapper.writeValueAsString(node), HttpStatus.BAD_REQUEST);
+        }
 
         byte[] linkImage = null;
         String filename = null;
@@ -64,7 +72,7 @@ public ResponseEntity<String> createSpaceLink(@PathVariable("id") String id, @Re
         ISpaceLinkDisplay display;
         try {
             display = spaceLinkManager.createLink(title, id, new Float(x), new Float(y), new Integer(rotation),
-                    linkedSpaceId, spaceLinkLabel, type, linkImage, filename);
+                    linkedSpaceId, spaceLinkLabel, spaceLinkDesc, type, linkImage, filename, imageId);
         } catch (ImageCouldNotBeStoredException e) {
             ObjectMapper mapper = new ObjectMapper();
             ObjectNode node = mapper.createObjectNode();
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java
index 13ea564fa..b6babf8be 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java
@@ -10,7 +10,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
-
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
@@ -31,14 +31,17 @@ public class EditExternalLinkController extends EditSpaceLinksController {
     private IExternalLinkManager externalLinkManager;
 
     @RequestMapping(value = "/staff/space/link/external/{id}", method = RequestMethod.POST)
-    public ResponseEntity<String> createExternalLink(@PathVariable("id") String id, @RequestParam("x") String x,
-            @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
-            @RequestParam("url") String externalLink,
-            @RequestParam("externalLinkIdValueEdit") String externalLinkIdValueEdit,
-            @RequestParam("externalLinkDisplayId") String externalLinkDisplayId,
-            @RequestParam("tabOpen") String howToOpen, @RequestParam("type") String displayType,
-            @RequestParam("externalLinkImage") MultipartFile file) throws SpaceDoesNotExistException, IOException,
-            LinkDoesNotExistsException, NumberFormatException, ImageCouldNotBeStoredException {
+	public ResponseEntity<String> createExternalLink(@PathVariable("id") String id, @RequestParam("x") String x,
+			@RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
+			@RequestParam("externalLinkDesc") String desc, @RequestParam("url") String externalLink,
+			@RequestParam("externalLinkIdValueEdit") String externalLinkIdValueEdit,
+			@RequestParam("externalLinkDisplayId") String externalLinkDisplayId,
+			@RequestParam(value="externalLinkImageIdEdit", required=false) String externalLinkImageIdEdit,
+			@RequestParam("tabOpen") String howToOpen, @RequestParam("type") String displayType,
+			@RequestParam("externalLinkImage") MultipartFile file,
+			@RequestParam(value = "imageId", required = false) String imageId)
+			throws SpaceDoesNotExistException, IOException, LinkDoesNotExistsException, NumberFormatException,
+			ImageCouldNotBeStoredException, ImageDoesNotExistException {
 
         ResponseEntity<String> validation = checkIfSpaceExists(spaceManager, id, x, y);
         if (validation != null) {
@@ -52,13 +55,13 @@ public ResponseEntity<String> createExternalLink(@PathVariable("id") String id,
         }
         DisplayType type = displayType.isEmpty() ? null : DisplayType.valueOf(displayType);
         ExternalLinkDisplayMode externalLinkOpenMode = howToOpen.isEmpty() ? null
-                : ExternalLinkDisplayMode.valueOf(howToOpen);
+				: ExternalLinkDisplayMode.valueOf(howToOpen);
         IExternalLinkDisplay display = (IExternalLinkDisplay) externalLinkManager.updateLink(title, id, new Float(x),
-                new Float(y), 0, externalLink, title, externalLinkIdValueEdit, externalLinkDisplayId, type, linkImage,
-                filename, externalLinkOpenMode);
+				new Float(y), 0, externalLink, title,desc, externalLinkIdValueEdit, externalLinkDisplayId, type, linkImage,
+				filename, imageId);
         return success(display.getExternalLink().getId(), display.getId(), display.getPositionX(),
-                display.getPositionY(), display.getRotation(), display.getExternalLink().getExternalLink(), title,
-                displayType, null, null);
+				display.getPositionY(), display.getRotation(), display.getExternalLink().getExternalLink(), title,
+				displayType, null, null);
 
     }
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditModuleLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditModuleLinkController.java
index c63889ea4..5b39b9c26 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditModuleLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditModuleLinkController.java
@@ -18,7 +18,7 @@
 import edu.asu.diging.vspace.core.model.display.IModuleLinkDisplay;
 import edu.asu.diging.vspace.core.services.IModuleLinkManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
-
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 @Controller
 public class EditModuleLinkController extends EditSpaceLinksController {
 
@@ -30,13 +30,14 @@ public class EditModuleLinkController extends EditSpaceLinksController {
 
     @RequestMapping(value = "/staff/space/link/module/{id}", method = RequestMethod.POST)
     public ResponseEntity<String> editModuleLink(@PathVariable("id") String id, @RequestParam("x") String x,
-            @RequestParam("y") String y, @RequestParam("rotation") String rotation,
-            @RequestParam("moduleLinkLabel") String title, @RequestParam("linkedModule") String linkedModuleId,
-            @RequestParam("moduleLinkLabel") String moduleLinkLabel,
-            @RequestParam("moduleLinkIdValueEdit") String moduleLinkIdValueEdit,
-            @RequestParam("moduleLinkDisplayId") String moduleLinkDisplayId, @RequestParam("type") String displayType,
-            @RequestParam("moduleLinkImage") MultipartFile file) throws NumberFormatException,
-            SpaceDoesNotExistException, LinkDoesNotExistsException, IOException, ImageCouldNotBeStoredException {
+        @RequestParam("y") String y, @RequestParam("rotation") String rotation,
+        @RequestParam("moduleLinkLabel") String title, @RequestParam("linkedModule") String linkedModuleId,
+        @RequestParam("moduleLinkLabel") String moduleLinkLabel,
+        @RequestParam("moduleLinkDesc") String moduleLinkDesc,
+        @RequestParam("moduleLinkIdValueEdit") String moduleLinkIdValueEdit,
+        @RequestParam("moduleLinkDisplayId") String moduleLinkDisplayId, @RequestParam("type") String displayType,
+        @RequestParam("moduleLinkImage") MultipartFile file, @RequestParam(value="imageId", required=false) String imageId) throws NumberFormatException,
+        SpaceDoesNotExistException, LinkDoesNotExistsException, IOException, ImageCouldNotBeStoredException, ImageDoesNotExistException {
 
         ResponseEntity<String> validation = checkIfSpaceExists(spaceManager, id, x, y);
         if (validation != null) {
@@ -50,8 +51,8 @@ public ResponseEntity<String> editModuleLink(@PathVariable("id") String id, @Req
         }
         DisplayType type = displayType.isEmpty() ? null : DisplayType.valueOf(displayType);
         IModuleLinkDisplay display = (IModuleLinkDisplay) moduleLinkManager.updateLink(title, id, new Float(x),
-                new Float(y), new Integer(rotation), linkedModuleId, moduleLinkLabel, moduleLinkIdValueEdit,
-                moduleLinkDisplayId, type, linkImage, filename);
+                new Float(y), new Integer(rotation), linkedModuleId, moduleLinkLabel,moduleLinkDesc, moduleLinkIdValueEdit,
+                moduleLinkDisplayId, type, linkImage, filename, imageId);
         return success(display.getLink().getId(), display.getId(), display.getPositionX(), display.getPositionY(),
                 display.getRotation(), null, title, displayType, linkedModuleId, null);
     }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpaceLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpaceLinkController.java
index 8fad32125..b0e7745aa 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpaceLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSpaceLinkController.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -11,6 +12,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
@@ -19,6 +23,7 @@
 import edu.asu.diging.vspace.core.model.impl.SpaceStatus;
 import edu.asu.diging.vspace.core.services.ISpaceLinkManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 
 @Controller
 public class EditSpaceLinkController extends EditSpaceLinksController {
@@ -30,14 +35,15 @@ public class EditSpaceLinkController extends EditSpaceLinksController {
     private ISpaceLinkManager spaceLinkManager;
 
     @RequestMapping(value = "/staff/space/link/space/{id}", method = RequestMethod.POST)
-    public ResponseEntity<String> editSpaceLink(@PathVariable("id") String id, @RequestParam("x") String x,
-            @RequestParam("y") String y, @RequestParam("rotation") String rotation,
-            @RequestParam("spaceLinkLabel") String title, @RequestParam("linkedSpace") String linkedSpaceId,
-            @RequestParam("spaceLinkLabel") String spaceLinkLabel,
-            @RequestParam("spaceLinkIdValueEdit") String spaceLinkIdValueEdit,
-            @RequestParam("spaceLinkDisplayId") String spaceLinkDisplayId, @RequestParam("type") String displayType,
-            @RequestParam("spaceLinkImage") MultipartFile file) throws NumberFormatException,
-            SpaceDoesNotExistException, LinkDoesNotExistsException, IOException, ImageCouldNotBeStoredException {
+	public ResponseEntity<String> editSpaceLink(@PathVariable("id") String id, @RequestParam("x") String x,
+		@RequestParam("y") String y, @RequestParam("rotation") String rotation,
+		@RequestParam("spaceLinkLabel") String title, @RequestParam("linkedSpace") String linkedSpaceId,
+		@RequestParam("spaceLinkLabel") String spaceLinkLabel,@RequestParam("spaceLinkDesc") String spaceLinkDesc,
+		@RequestParam("spaceLinkIdValueEdit") String spaceLinkIdValueEdit,
+		@RequestParam("spaceLinkDisplayId") String spaceLinkDisplayId,
+		@RequestParam("type") String displayType, @RequestParam(value="spaceLinkImage", required = false) MultipartFile file,
+		@RequestParam(value = "imageId", required = false) String imageId) throws NumberFormatException,
+		SpaceDoesNotExistException, LinkDoesNotExistsException, IOException, ImageCouldNotBeStoredException, ImageDoesNotExistException {
 
         ResponseEntity<String> validation = checkIfSpaceExists(spaceManager, id, x, y);
         if (validation != null) {
@@ -45,18 +51,24 @@ public ResponseEntity<String> editSpaceLink(@PathVariable("id") String id, @Requ
         }
         byte[] linkImage = null;
         String filename = null;
-        if (file != null) {
+        if (file != null && !file.isEmpty()) {
             linkImage = file.getBytes();
             filename = file.getOriginalFilename();
         }
+        if (file == null && (imageId == null || imageId.equals(""))) {
+            ObjectMapper mapper = new ObjectMapper();
+            ObjectNode node = mapper.createObjectNode();
+            node.put("errorMessage", "No image provided for space link.");
+            return new ResponseEntity<String>(mapper.writeValueAsString(node), HttpStatus.BAD_REQUEST);
+        }
         DisplayType type = displayType.isEmpty() ? null : DisplayType.valueOf(displayType);
         ISpaceLinkDisplay display = (ISpaceLinkDisplay) spaceLinkManager.updateLink(title, id, new Float(x),
-                new Float(y), new Integer(rotation), linkedSpaceId, spaceLinkLabel, spaceLinkIdValueEdit,
-                spaceLinkDisplayId, type, linkImage, filename);
+				new Float(y), new Integer(rotation), linkedSpaceId, spaceLinkLabel,spaceLinkDesc, spaceLinkIdValueEdit,
+				spaceLinkDisplayId, type, linkImage, filename,  imageId);
         SpaceStatus targetSpaceStatus = spaceManager.getSpace(linkedSpaceId).getSpaceStatus();
         String linkedSpaceStatus = targetSpaceStatus != null ? targetSpaceStatus.toString() : null;
         return success(display.getLink().getId(), display.getId(), display.getPositionX(), display.getPositionY(),
-                display.getRotation(), null, title, displayType, linkedSpaceId, linkedSpaceStatus);
+				display.getRotation(), null, title, displayType, linkedSpaceId, linkedSpaceStatus);
     }
 
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSearchSpaceController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSearchSpaceController.java
index 8b25ae9dd..4f67a22f6 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSearchSpaceController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSearchSpaceController.java
@@ -12,8 +12,12 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.services.ISpaceManager;
 import edu.asu.diging.vspace.core.services.IStaffSearchManager;
 import edu.asu.diging.vspace.core.services.impl.model.StaffSearchSpaceResults;
 
@@ -22,6 +26,9 @@ public class StaffSearchSpaceController {
 
     @Autowired
     private IStaffSearchManager staffSearchManager;
+    
+    @Autowired
+    private ISpaceManager spaceManager;
 
     @RequestMapping(value = "/staff/search/space")
     public ResponseEntity<StaffSearchSpaceResults> searchInVspace(
@@ -33,6 +40,7 @@ public ResponseEntity<StaffSearchSpaceResults> searchInVspace(
         staffSearch.setSpaces(spaceList);
         return new ResponseEntity<StaffSearchSpaceResults>(staffSearch, HttpStatus.OK);
     }
+    
 
     /**
      * This method is used to search the search string specified in the input
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateContentOrderController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateContentOrderController.java
index 75d409c53..533cfc094 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateContentOrderController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateContentOrderController.java
@@ -8,13 +8,20 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import edu.asu.diging.vspace.core.exception.BlockDoesNotExistException;
+import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.impl.ContentBlock;
 import edu.asu.diging.vspace.core.services.IContentBlockManager;
+import edu.asu.diging.vspace.core.services.ISlideManager;
 
 @Controller
 public class UpdateContentOrderController {
@@ -23,17 +30,25 @@ public class UpdateContentOrderController {
 
     @Autowired
     private IContentBlockManager contentBlockManager;
+    
+    @Autowired
+    private ISlideManager slideManager;
 
     @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/blocks/order/update", method = RequestMethod.POST)
-    public ResponseEntity<List<ContentBlock>> adjustContentOrder(@RequestBody List<ContentBlock> contentBlockList) {
+    public ResponseEntity<List<ContentBlock>> adjustContentOrder(@RequestBody String contentBlockString, @PathVariable("id") String slideId) {
 
+        ObjectMapper objectMapper = new ObjectMapper();
+        ISlide slide = slideManager.getSlide(slideId);
+        List<ContentBlock> contentBlockList;
         try {
-            contentBlockManager.updateContentOrder(contentBlockList);
-        } catch (BlockDoesNotExistException e) {
-            logger.warn("Block Id does not exist, bad request.", e);
-            return new ResponseEntity<List<ContentBlock>>(HttpStatus.BAD_REQUEST);
+            System.out.println(contentBlockString);
+            contentBlockList = objectMapper.readValue(contentBlockString, new TypeReference<List<ContentBlock>>(){});
+            contentBlockManager.updateContentOrder(contentBlockList,slide);
+        } catch (Exception e) {
+            logger.warn("Error while parsing content blocks.", e);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
-        return new ResponseEntity<List<ContentBlock>>(contentBlockList,HttpStatus.OK);
+        return new ResponseEntity<List<ContentBlock>>(contentBlockList, HttpStatus.OK);
     }
+}
 
-}
\ No newline at end of file
diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
index 041bf1fed..07d97ba3c 100644
--- a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
+++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
@@ -406,10 +406,10 @@
                     var posX = parseInt($("#space").css('margin-left')) + $("#space").position().left; 
     		        var posY = $("#space").position().top;
     		        var spaceLink = $('<a></a>');
-    		        if(isExhPreview=== true){
+    		        if(isExhPreview=== true) {
     		        	spaceLink.attr("href",[[@{|/preview/${previewId}/space/|}]]+link.link.targetSpace.id);
     		        }
-    		        else{
+    		        else {
     		        	spaceLink.attr("href", link.link.targetSpace.id);
     		        }
     		        var linkDisplay = $('<div class="InfoSpace_'+index+' Info_cz_Class"><svg class="Ellipse_8_c"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-move Icon_awesome_info_c"></span><span class="tooltiptext">'+link.link.name+'</span></div>');
@@ -417,8 +417,8 @@
     		            linkDisplay = $('<div class="InfoSpace_'+index+' alert alert-primary" role="alert"><span class="tooltiptextalert">'+link.link.name+'</span></div>');
     		        }
     		        else if(link.type=="IMAGE" && link.image != null){
-                        var spaceImageURL = [[@{/api/image/}]]+link.image.id;
-                        linkDisplay = $('<img class="InfoSpace_'+index+'" src="'+spaceImageURL+'" />');
+    		            var spaceImageURL = [[@{/api/image/}]]+link.image.id;
+    		            linkDisplay = $('<img class="InfoSpace_'+index+'" src="'+spaceImageURL+'" />');
     		        }
     		        else if(defaultSpaceImageFlag === true) {
     		        	var defaultSpaceLinkImageURL = [[@{/api/image/default/link/space/}]];
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index d1708279e..5388a7cbb 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -1,48 +1,51 @@
 <html layout:decorate="~{layouts/main_staff}">
     <head>
-        <link rel="stylesheet"
-            href="https://unpkg.com/easymde/dist/easymde.min.css">
-      <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css">
+        <link rel="stylesheet" href="https://unpkg.com/easymde/dist/easymde.min.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css">
         <script src="https://unpkg.com/easymde/dist/easymde.min.js"></script>
         <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/css/select2.min.css" rel="stylesheet" />
         <script src="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>
-		<script th:src="@{/resources/jquery/jquery-ui.min_custom_sortable.js}"></script>
+        <script th:src="@{/resources/jquery/jquery-ui.min_custom_sortable.js}"></script>
         <style type="text/css">
             .hova {
             background-color: #f2f2f2;
-            }
-            .EasyMDEContainer .CodeMirror-wrap{
+        }
+
+        .EasyMDEContainer .CodeMirror-wrap {
             overflow-y: scroll;
             height: 400px;
-            }
-            .fixed {
-		    position: fixed;
-		    top:0; left:0;
-		    width: 100%;
-		    z-index:100;
-     		}
-     		
-     		li.active>a{
-			background: solid var(--primary);
-			color: #fff;
-			font-size: 15px;
-			}
-			
-			a.nav-link.active.show {
-			border-color: transparent;
-			border-bottom: 4px solid var(--primary);
-			color: var(--primary) !important;
-			background: transparent;
-			}
-            .tooltip {
-                z-index: 0;
-            }
+        }
+
+        .fixed {
+            position: fixed;
+            top: 0;
+            left: 0;
+            width: 100%;
+            z-index: 100;
+        }
+        
+        li.active>a{
+            background: solid var(--primary);
+            color: #fff;
+            font-size: 15px;
+        }
+        
+        a.nav-link.active.show {
+            border-color: transparent;
+            border-bottom: 4px solid var(--primary);
+            color: var(--primary) !important;
+            background: transparent;
+        }
+
+        .tooltip {
+            z-index: 0;
+        }
         </style>
         <script th:inline="javascript">
             $(function () {
-		        $('.close').on('click', function () {
-		        	$('.modal').hide();
-		        })
+                $('.close').on('click', function () {
+                    $('.modal').hide();
+                })
             })
 
             var currentSpaceName;
@@ -59,7 +62,6 @@
             $(function () {
             	  $('[data-toggle="tooltip"]').tooltip()
             });
-            
             $(window).scroll(function(){
             	  var sticky = $('.sticky'),
             	      scroll = $(window).scrollTop();
@@ -221,7 +223,6 @@
                 });
             }
 
-            
             var originalTextHtml = {};
 
             function textBlockDoubleClick(e) {
@@ -229,7 +230,6 @@
                 $(".EasyMDEContainer").remove();
                 var divName = $(e.target).closest('div').attr('class');
                 
-                //if the div is a text content block 
                 var textBlock = $(e.target).closest('.textDivStaff');
                 textBlock.addClass("open");
                 
@@ -872,31 +872,50 @@
             	  });
             	var timeout=null;
             	$('#slideSpace').sortable({
-	            	update: function(event,ui) {
-		            	var jsonObj = [];
-		            	var blockId;
-		            	$(this).children().each(function(index,element){
-			            	if(typeof($(element.innerHTML).filter('div').attr('data-position'))=="undefined") {
-			            		blockId=$(element).attr('id');
-			            	}else {
-			            		blockId = $(element.innerHTML).filter('div').attr('id');
-			            	}
-			            	item = {}
-			            	item ["id"] = blockId;
-			            	item ["contentOrder"] = index;
-			            	jsonObj.push(item);
-			            	$(element.innerHTML).filter('div').attr('data-position',index);
-		            	});
-		            	var token = [[${_csrf.token}]];
-		            	if (jsonObj.length != 0){
-			            	if (timeout != null){
-			            		clearTimeout(timeout);
-			            	}
-			            	timeout = setTimeout(updateContentOrder(jsonObj,token), 1000);
-		            	}
-	            	}
+            	    // This function is called whenever the sorting is updated
+            	    update: function(event, ui) {
+            	        // Array to store the JSON representation of each sortable item
+            	        var jsonObj = [];
+            	        // Variable to store the ID of the current sortable item
+            	        var blockId;
+
+            	        // Loop through each sortable item within the container
+            	        $(this).children().each(function(index, element) {
+            	            // Check if the data-position attribute is undefined
+            	            if (typeof($(element.innerHTML).filter('div').attr('data-position')) == "undefined") {
+            	                // If undefined, set the blockId to the ID attribute of the current element
+            	                blockId = $(element).attr('id');
+            	            } else {
+            	                // If not undefined, set the blockId to the ID attribute of the child div element
+            	                blockId = $(element.innerHTML).filter('div').attr('id');
+            	            }
+            	            // Create an object representing the current sortable item
+            	            var item = {};
+            	            item["id"] = blockId;
+            	            item["contentOrder"] = index;
+            	            item["slide"] = null;
+            	            // Add the item to the jsonObj array
+            	            jsonObj.push(item);
+            	            // Set the data-position attribute of the child div element to the current index
+            	            $(element.innerHTML).filter('div').attr('data-position', index);
+            	        });
+
+            	        // Retrieve the CSRF token from the server-side
+            	        var token = [[${_csrf.token}]];
+            	        
+            	        // Check if the jsonObj array is not empty
+            	        if (jsonObj.length != 0) {
+            	            // If a previous timeout is set, clear it
+            	            if (timeout != null) {
+            	                clearTimeout(timeout);
+            	            }
+            	            // Set a timeout to update the content order after 1000 milliseconds (1 second)
+            	            timeout = setTimeout(updateContentOrder(jsonObj, token), 1000);
+            	        }
+            	    }
             	});
 
+
             	function updateContentOrder(jsonObj,token){
 	            		$.ajax({
 	            		 // ------------- adjusting content order of blocks if their position changed after dragging ----------
@@ -1063,42 +1082,93 @@
                     $("#addTextAlert").show();
                 });
                 
-	            $("#addSpace").click(function() {
-		            markDown = new EasyMDE({element: $('#spaceBlockText')[0]});
-		            $("#addSpaceAlert").show();
-	            });
+                $("#addSpace").click(function() {
+                    markDown = new EasyMDE({element: $('#spaceBlockText')[0]});
+                    $("#addSpaceAlert").show();
+                });
 
-	            $("#spaceName").select2({
-		            ajax: {
-			            url: [[@{|/staff/spaces/search|}]],
-			            dataType: 'json',
-			            processResults: function (data) {
-				            return {
-				            	results: data,
-				            };
-			            },
-		            },
-		            templateResult: formatSpace,
-		            templateSelection: formatSpace
-	            });
+                $("#spaceName").select2({
+                    ajax: {
+                        url: [[@{|/staff/spaces/search|}]],
+                        dataType: 'json',
+                        processResults: function (data) {
+                            return {
+                                results: data,
+                            };
+                        },
+                    },
+                    templateResult: formatSpace,
+                    templateSelection: formatSpace
+                });
 
-	            function formatSpace (space) {
-		            if (!space.id) {
-		            	return space.name;
-		            }
-		            var $space = $('<span>' + space.name + '</span>');
-		            return $space;
-	            }
-	
+                function formatSpace (space) {
+                    if (!space.id) {
+                        return space.name;
+                    }
+                    var $space = $('<span>' + space.name + '</span>');
+                    return $space;
+                }
+    
                 $("#addImage").click(function() {
                     $("#addImgAlert").show();
                 });
                 
-                $("#addVideo").click(function() {
-                    $("#videoTitle").value = "";
-                    $("#addVideoAlert").show();
-                    addVideoClk =1;
-                    editVideoClk=0;
+                $("#editSpaceName").select2({
+                	ajax: {
+            		    url: function (params) {
+            		  		var spaceURL = [[@{|/staff/spaces/search|}]];
+            		  		return spaceURL;
+            		    },
+            		    dataType: 'json',
+            		    processResults: function (data) {
+            		        return {
+            		          results: data,
+            		        };
+            		      },
+            		},
+            		templateResult: formatSpace,
+            		templateSelection: formatSpaceSelection
+                });
+                
+                $("#spaceName").select2({
+                	ajax: {
+            		    url: function (params) {
+            		  		var spaceURL = [[@{|/staff/spaces/search|}]];
+            		  		return spaceURL;
+            		    },
+            		    dataType: 'json',
+            		    processResults: function (data) {
+            		        return {
+            		          results: data,
+            		        };
+            		      },
+            		},
+            		templateResult: formatSpace,
+            		templateSelection: formatSpaceSelection
+                });
+                
+                function formatSpace (space) {
+                	if (!space.id) {
+                	    return space.name;
+                	}
+                	var $space = $(
+                	    '<span>' + space.name + '</span>'
+                	);
+                	return $space;
+                }
+                
+                function formatSpaceSelection(space) {
+                	if (!space.id) {
+                            return space.name;
+                    }
+                    var $image = $(
+                        '<span>' + space.name + '</span>'
+                    );
+                    return $image;
+                }
+                
+                $("#addImage").click(function() {
+                    $("#addImgAlert").show();
                 });
                 
                 $("#uploadImage").click(function(e) {
@@ -1108,20 +1178,6 @@
                     $('#chooseFromLocal').trigger( "click" );
                 });
                 
-                $("#saveVideo").click(function(e) {
-                    e.preventDefault();
-                    $("#addVideoAlert").hide();
-                    embedVideo();
-                    $("#saveVideo").data('value', '');
-                    $("#saveVideo").data('url', '');
-                    $("#uploadTab").addClass("active");
-                    $("#urlTab").removeClass("active");
-                    $("#urlLink").removeClass("active show");
-                    $("#urlLink>a").removeClass("active show");
-                    $("#uploadLink").addClass("active show");
-                    $("#uploadLink>a").addClass("active show");
-                });
-                
                 $("#addChoice").click(function() {
                     $("#addChoiceAlert").show();
                 });
@@ -1159,23 +1215,6 @@
                     $('#confirmDeleteImageAlert .modal-footer').append(imageInput);
                 });
             	
-             	// Delete Video Click Handler
-                $(document).on("click", "[data-action='delete-video']", function(e) {
-                    $("#confirmDeleteVideoAlert .modal-footer input[type='hidden']").remove();
-                    
-                    var videoId = $(this).attr('data-video-id');
-                    $("#videoIdToDelete").val(videoId);
-                    
-                    $(".load").remove();
-                    $("#" + videoId).append($('<div class="load" style="font-size: 30px;display: none; text-align: center;"><i class="fa fa-spinner fa-spin" aria-hidden="true"></i></div>'));
-                    $(".load").show();
-                    
-                    setTimeout(function() {
-                        $(".load").hide();
-                        $("#confirmDeleteVideoAlert").show();
-                    }, 3000);
-                });
-            	
             $("#addBibliography").click(function() {
                  $("#addBiblioAlert").show();
              });
@@ -1232,7 +1271,7 @@
              });
                 
                 $("#cancelSubmitText").click(function() {
-            		$("#addTextAlert").hide();	
+            	    $("#addTextAlert").hide();	
             	});
 
                 $("#cancelSpaceText").click(function() {
@@ -1266,16 +1305,11 @@
 					$("#confirmDeleteChoiceBlockAlert").find('input').remove();
 					$("#confirmDeleteSpaceAlert").hide();
             	});
-	            
+            	
             	$("#cancelDeleteImage").click(function() {
             		$("#confirmDeleteImageAlert").hide();
             	});
             	
-            	$("#cancelDeleteVideo").click(function() {
-            		$("#confirmDeleteVideoAlert").find('input').remove();
-            		$("#confirmDeleteVideoAlert").hide();	
-            	});
-            	
          	$("#cancelSubmitBiblio").click(function() {
          		$("#addBiblioAlert").hide();	
          	});
@@ -1809,8 +1843,8 @@
                 });
                 
                 $("#file").click(function() {
-                    $("#selectedImage").empty();
-                    $('#imageId').prop('selectedIndex',0).trigger( "change" );
+                	$("#selectedImage").empty();
+                	$('#imageId').prop('selectedIndex',0).trigger( "change" );
                 });
                 
                 $("#submitText").on("click", function(e) {
@@ -1913,7 +1947,6 @@
                         });
                     }
                 });
-
                 $('input:checkbox').click(function() {
                     if ($(this).is(':checked')) {
                     	$('#submitChoices').prop("disabled", false);
@@ -1982,98 +2015,6 @@
                     });
                     $('#choiceForm')[0].reset();
                 });
-            
-                $("#urlLink").on("click", function (e) {
- 				    if ($("#videoFile").val()) {
- 						$("#videoTitle").prop('disabled', true);
- 						$("#videoLink").prop('disabled', true);
- 						$("#saveVideo").prop('disabled', true);
- 					}
- 					if (!$("#videoFile").val()) {
- 						$("#videoTitle").prop('disabled', false);
- 						$("#videoLink").prop('disabled', false);
- 						$("#saveVideo").prop('disabled', false);
- 					}
- 					if (!$("#videoTitle").val() && !$("#videoLink").val()) {
- 						$("#saveVideo").prop('disabled', true);
- 					}
- 					if (!$("#videoTitle").val() && $("#videoLink").val()) {
- 						$("#saveVideo").prop('disabled', true);
- 					}
- 					$("#urlLink").addClass("active show");
- 					$("#uploadLink").removeClass("active show");
-                    if(addVideoClk==1 && editVideoClk==0){
-                        $("#saveVideo").html("Embed Video"); 
-                        if (!$("#videoTitle").val() || !$("#videoLink").val()) {
-     						$("#saveVideo").prop('disabled', true);
-     					}
-                    }
-                    if(addVideoClk==0 && editVideoClk==1){
-                        $("#saveVideo").html("Update Video");  
-                        if ($("#videoTitle").val() && !$("#videoLink").val()) {
-     						$("#saveVideo").prop('disabled', false);
-     					}
-                        if (!$("#videoTitle").val() && $("#videoLink").val()) {
-     						$("#saveVideo").prop('disabled', true);
-     					}
-                    }
-                    
- 				});
-
- 				$("#uploadLink").on("click", function (e) {
- 				    if ($("#videoLink").val()) {
- 						$("#videoTitle").prop('disabled', true);
- 						$("#videoFile").prop('disabled', true);
- 						$("#saveVideo").prop('disabled', true);
- 					}else {
- 						$("#videoTitle").prop('disabled', false);
- 						$("#videoFile").prop('disabled', false);
- 						$("#saveVideo").prop('disabled', false);
- 					}
- 					
- 					if (!$("#videoTitle").val() && !$("#videoFile").val()) {
- 						$("#saveVideo").prop('disabled', true);
- 					}
- 					$("#urlLink").removeClass("active show");
- 					$("#uploadLink").addClass("active show");
- 				   if(addVideoClk==1 && editVideoClk==0){
-                       $("#saveVideo").html("Upload Video");   
-                       if (!$("#videoTitle").val() || !$("#videoFile").val()) {
-    						$("#saveVideo").prop('disabled', true);
-    					}
-                   }
-                   if(addVideoClk==0 && editVideoClk==1){
-                       $("#saveVideo").html("Update Video");  
-                       if ($("#videoTitle").val() && !$("#videoFile").val()) {
-    						$("#saveVideo").prop('disabled', false);
-    					}
-                       if (!$("#videoTitle").val() && $("#videoFile").val()) {
-    						$("#saveVideo").prop('disabled', true);
-    					}
-                   }
- 				});
- 				
- 				$("#videoLink").on("input", function (e) {
- 				    if (!$("#videoLink").val()) {
- 						$("#saveVideo").prop('disabled', true);
- 					}else {
- 						$("#saveVideo").prop('disabled', false);
- 					}
- 				});
- 				
- 				$("#videoFile").on("input", function (e) {
- 				    if (!$("#videoFile").val()) {
- 						$("#saveVideo").prop('disabled', true);
- 					}else {
- 						$("#saveVideo").prop('disabled', false);
- 					}
- 				});
- 				
- 				$("#videoTitle").on("input", function (e) {
- 				    if ($("#videoFile").val() || $("#videoLink").val()) {
- 						$("#saveVideo").prop('disabled', false);
- 					}
- 				}); 
                 
  				function updateTextBox(blockId, text) {
  				    // clear text box and buttons
@@ -2101,6 +2042,21 @@
  				    $(".open").removeClass("open");
  				}
                 
+                function updateSpaceBox(blockId, text) {
+                    // clear text box and buttons
+                    $(".open").empty();
+                    $(".open").append('<label>Title: </label><p class="col-md-10">'+text+'</p><input type="hidden" id="deleteSpaceId" value="'+blockId+'" /><a class="btn deleteSpace col-md-1" href="javascript:;" style="position: absolute; right:0;"><span class="icon-trash error"></span></a>');
+                    // reset border of the card
+                    //rebind event handlers
+                    $('.SpaceDivStaff').mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
+                    //resetting the height and overflow-y so that the TextBlock doesn't expand
+                    $('.SpaceDivStaff').css('height', 'auto');
+                    $('.SpaceDivStaff').css('overflow-y', 'visible');
+                    $(".open").css('display', 'flex');
+                    // remove id from storage so its not there on refresh
+                    $(".open").removeClass("open");
+                }
+                
                 // must add the event to the document since the buttons are added dynamically
 				$('#cancelTextBlock').on('click', function() {
 				    $("#editTextAlert").hide();
@@ -2400,7 +2356,7 @@
                     		}
                     }
                 });
-             });   
+             });
              
                 $("#submitBiblioBlock").on("click", function(e) {
                     e.preventDefault();
@@ -2668,6 +2624,7 @@
                     $("#addVideoAlert").show();
             	}
             });
+            
         </script>
     </head>
     <body>
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.html
index b6f5f2073..bbf795af2 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.html
@@ -43,16 +43,15 @@
     
     var textBlockElements = document.getElementsByClassName("textBlock");
     Array.from(textBlockElements).forEach(function(textBlock, index){
-    	if(textBlock != null) {
-    	   	const color = textBlock.style.borderColor;
-         	textBlock.addEventListener('focus', function(e) {
-       		e.target.style.outline = "2px solid "+ color;
-         	});
-         	textBlock.addEventListener('blur', function(e) {
-         		e.target.style.outline = "none";
-        	});
-    	}
- 
+        if(textBlock != null) {
+            const color = textBlock.style.borderColor;
+            textBlock.addEventListener('focus', function(e) {
+                e.target.style.outline = "2px solid "+ color;
+            });
+            textBlock.addEventListener('blur', function(e) {
+                e.target.style.outline = "none";
+            });
+        }
     })
 });
 //store where a user clicked on an image
@@ -87,7 +86,7 @@
 var moduleLinkIconReader = new FileReader();
 var moduleLinkIcon;
 moduleLinkIconReader.onload = function(e) {
-	moduleLinkIcon = e.target.result;
+    moduleLinkIcon = e.target.result;
     showModuleLink(createModuleLinkInfo());
 }
 
@@ -115,7 +114,7 @@
 }
 
 function setLinkPosition(modalLink, link, isSpaceLink, isModal, isExternalLink, posX, posY, posXModal, posYModal, isTextBlock, isModuleLink){
-	modalLink.css('position', 'absolute');
+    modalLink.css('position', 'absolute');
     if(isModal){
         modalLink.css('left',link.positionX + posXModal);
         modalLink.css('top', link.positionY + posYModal);
@@ -130,38 +129,38 @@
     var positionX = isModal ? posXModal : posX;
     var positionY = isModal ? posYModal : posY;
     if(isSpaceLink && (link.link.targetSpace==null || link.link.targetSpace.spaceStatus=="UNPUBLISHED")){
-	var inactiveLinkId;
-	var inactiveLinkClasses;
-	var inactiveLinkTitle;
-	if(link.link.targetSpace==null) {
-	    inactiveLinkId = "deletedSpace-";
-	    inactiveLinkClasses = "deletedSpaceClass deletedClass-";   
-	    inactiveLinkTitle = "The target space for this link has been deleted. This link won't be shown on the public site."
-    	} else {
-	    inactiveLinkId = "unpublished-";
-	    inactiveLinkClasses = "unpublishedSpaceClass unpublishedClass-";
-	    inactiveLinkTitle = "The target space for this link is unpublished. This link won't be shown on the public site."
-    	}
-	var inactiveSpaceElement  = $('<span data-link-id="'+inactiveLinkId +link.link.id+'" class="icon-warning secondary '+inactiveLinkClasses+link.link.id+'"></span>')
-    	inactiveSpaceElement.css('position', 'absolute');
-	inactiveSpaceElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
-	inactiveSpaceElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
-	inactiveSpaceElement.css('transform', 'rotate('+link.rotation+'deg)');
-	inactiveSpaceElement.css('font-size', "24px");
-	inactiveSpaceElement.attr('title', inactiveLinkTitle);
-	if(isModal){
-	    $("#space").append(inactiveSpaceElement);
-	} else{
-	    $("#main-space").append(inactiveSpaceElement);
-	}
+        var inactiveLinkId;
+        var inactiveLinkClasses;
+        var inactiveLinkTitle;
+        if(link.link.targetSpace==null) {
+            inactiveLinkId = "deletedSpace-";
+            inactiveLinkClasses = "deletedSpaceClass deletedClass-";   
+            inactiveLinkTitle = "The target space for this link has been deleted. This link won't be shown on the public site."
+        } else {
+            inactiveLinkId = "unpublished-";
+            inactiveLinkClasses = "unpublishedSpaceClass unpublishedClass-";
+            inactiveLinkTitle = "The target space for this link is unpublished. This link won't be shown on the public site."
+        }
+        var inactiveSpaceElement  = $('<span data-link-id="'+inactiveLinkId +link.link.id+'" class="icon-warning secondary '+inactiveLinkClasses+link.link.id+'"></span>')
+        inactiveSpaceElement.css('position', 'absolute');
+        inactiveSpaceElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
+        inactiveSpaceElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
+        inactiveSpaceElement.css('transform', 'rotate('+link.rotation+'deg)');
+        inactiveSpaceElement.css('font-size', "24px");
+        inactiveSpaceElement.attr('title', inactiveLinkTitle);
+        if(isModal){
+            $("#space").append(inactiveSpaceElement);
+        } else{
+            $("#main-space").append(inactiveSpaceElement);
+        }
     }
     if(isModuleLink && link.link.module.moduleStatus!=null && link.link.module.moduleStatus=="UNPUBLISHED"){
-    	var unpublishedModuleElement = $('<span data-link-id="unpublished-'+link.link.id+'" class="icon-warning secondary unpublishedSpaceClass unpublishedClass-'+link.link.id+'"></span>')
+        var unpublishedModuleElement = $('<span data-link-id="unpublished-'+link.link.id+'" class="icon-warning secondary unpublishedSpaceClass unpublishedClass-'+link.link.id+'"></span>')
         unpublishedModuleElement.css('position', 'absolute');
-    	unpublishedModuleElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
-    	unpublishedModuleElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
-    	unpublishedModuleElement.css('transform', 'rotate('+link.rotation+'deg)');
-    	unpublishedModuleElement.css('font-size', "24px");
+        unpublishedModuleElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
+        unpublishedModuleElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
+        unpublishedModuleElement.css('transform', 'rotate('+link.rotation+'deg)');
+        unpublishedModuleElement.css('font-size', "24px");
         if(isModal){
             $("#space").append(unpublishedModuleElement);
         }else{
@@ -174,11 +173,11 @@
     }
 }
 function setLabelPosition(link,id, positionX, positionY){
-	$(".label-"+id).css({
-	    'left': link.positionX + positionX - displaceLableOnX,
-	    'top': link.positionY + positionY + displaceLableOnY,
-	    'color': 'red'
-	}); 
+    $(".label-"+id).css({
+        'left': link.positionX + positionX - displaceLableOnX,
+        'top': link.positionY + positionY + displaceLableOnY,
+        'color': 'red'
+    }); 
 }
 
 function generateSpaceLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
@@ -979,6 +978,140 @@
             if ($("div#incomingLinks a").length < 2) {
                 $("#noLinksToSpace").show()
             }
+            $('#externalLink-imageId').prop("disabled",true);
+            $('#module-imageId').prop("disabled",true);
+            $('#space-imageId').prop("disabled",true);
+            
+        	$('#externalLink-chooseFromLocal').click(function() {
+        		$("#selectedImage").empty();
+        		$('#externalLink-imageId').prop('selectedIndex',0).trigger( "change" );
+        		$('#externalLink-imageId').prop("disabled",true);
+        		$('#externalLinkImage').prop("disabled",false);
+        		
+        	  });
+        	
+        	$('#module-chooseFromLocal').click(function() {
+        		$("#selectedImage").empty();
+        		$('#module-imageId').prop('selectedIndex',0).trigger( "change" );
+        		$('#module-imageId').prop("disabled",true);
+        		$('#moduleLinkImage').prop("disabled",false);
+        	});
+    		
+        	$('#space-chooseFromLocal').click(function() {
+        		$("#selectedImage").empty();
+        		$('#space-imageId').prop('selectedIndex',0).trigger( "change" );
+        		$('#space-imageId').prop("disabled",true);
+        		$('#spaceLinkImage').prop("disabled",false);
+        	});
+    		
+        	$('#externalLink-chooseFromExisting').click(function() {
+        		$('#externalLinkImage').val('');
+        		$('#externalLinkImage').prop("disabled",true);
+        		$('#externalLink-imageId').prop("disabled",false);
+        	});
+        	
+        	$('#module-chooseFromExisting').click(function() {
+        		$('#moduleLinkImage').val('');
+        		$('#moduleLinkImage').prop("disabled",true);
+        		$('#module-imageId').prop("disabled",false);
+        	});
+        	
+        	$('#space-chooseFromExisting').click(function() {
+        		$('#spaceLinkImage').val('');
+        		$('#spaceLinkImage').prop("disabled",true);
+        		$('#space-imageId').prop("disabled",false);
+        	  });
+        	
+        	$("#spaceLinkImage").click(function() {
+            	$("#selectedImage").empty();
+            	$('#space-imageId').prop('selectedIndex',0).trigger( "change" );
+            });
+        	
+        	$("#moduleLinkImage").click(function() {
+            	$("#selectedImage").empty();
+            	$('#module-imageId').prop('selectedIndex',0).trigger( "change" );
+            });
+        	
+        	$("#externalLinkImage").click(function() {
+            	$("#selectedImage").empty();
+            	$('#externalLink-imageId').prop('selectedIndex',0).trigger( "change" );
+            });
+        	
+        	
+            $("#externalLink-imageId").select2({
+        		ajax: {
+        		    url: function (params) {
+        		  		var imageURL = [[@{|/staff/images/search|}]];
+        		  		return imageURL;
+        		    },
+        		    dataType: 'json',
+        		    processResults: function (data) {
+        		        return {
+        		          results: data,
+        		        };
+        		      },
+        		},
+        		templateResult: formatImage,
+        		templateSelection: formatSelection
+            });
+            
+            $("#module-imageId").select2({
+        		ajax: {
+        		    url: function (params) {
+        		  		var imageURL = [[@{|/staff/images/search|}]];
+        		  		return imageURL;
+        		    },
+        		    dataType: 'json',
+        		    processResults: function (data) {
+        		        return {
+        		          results: data,
+        		        };
+        		      },
+        		},
+        		templateResult: formatImage,
+        		templateSelection: formatSelection
+            });
+            
+            $("#space-imageId").select2({
+        		ajax: {
+        		    url: function (params) {
+        		  		var imageURL = [[@{|/staff/images/search|}]];
+        		  		return imageURL;
+        		    },
+        		    dataType: 'json',
+        		    processResults: function (data) {
+        		        return {
+        		          results: data,
+        		        };
+        		      },
+        		},
+        		templateResult: formatImage,
+        		templateSelection: formatSelection
+            });
+            
+            function formatImage (image) {
+            	if (!image.id) {
+            		return image.text;
+            	}
+            	var tbaseUrl = [[@{|/api/image/|}]];
+            	var $image = $(
+            			'<span><img src="' + tbaseUrl + image.id + '" class="img-thumbnail" /> ' + image.text + '</span>'
+            	);
+            	return $image;
+            };
+            
+            function formatSelection(image) {
+            	if (!image.id) {
+                    return image.text;
+                }
+            	var tbaseUrl = [[@{|/api/image/|}]];
+                var $image = $(
+                        '<span>' + image.text + '</span>'
+                );
+                $("#selectedImage").empty();
+                $("#selectedImage").append('<img width="200px" src="' + tbaseUrl + image.id + '" class="img-thumbnail" />');
+                return $image;
+            }
         });
 
         // -------- buttons that open modals (e.g. to create space links) ------
@@ -1315,6 +1448,8 @@
                     $("#link").attr("id","");
                     $("#createModuleLinkAlert").hide();
                     $("#errorMsg").text("");
+                    $("#selectedImage").empty();
+                    $("#module-imageId").value("");
                     $('#errorAlert').hide();
                     $("."+linkData["id"]).remove();
                     form[0].reset();
@@ -1474,6 +1609,7 @@
         });
 
         $("#createExternalLinkBtn").click(function(e) {
+        	
             e.preventDefault();
             $("#space").scrollTop(0);
             var payload = {};
@@ -1508,8 +1644,14 @@
             $("#externalLinkX").val(storeX);
             $("#externalLinkY").val(storeY - 25);
 
+            var file = $('#externalLinkImage')[0].files[0];
             var form = $("#createExternalLinkForm");
             var formData = new FormData(form[0]);
+/*             var chooseFromExisting = true;
+        	if (typeof(file) != "undefined"){
+        		chooseFromExisting = false;
+        		formData.append('file', file);
+        	} */
             var externalLinkInfo = createExternalLinkInfo();
 
             $.ajax({
@@ -1527,6 +1669,7 @@
                     $(".saveLoader").hide();
                     },
                 success: function(data) {
+                	console.log("Success");
                     var linkData = JSON.parse(data);
                     $("#bgImage").off("click");
                     externalLinkInfo["id"] = linkData["id"];
@@ -1538,6 +1681,8 @@
                     $("#link").attr("id","");
                     $("#createExternalLinkAlert").hide();
                     $("#errorMsg").text("");
+                    $("externalLink-imageId").value = "";
+                    $("#selectedImage").empty();
                     $('#errorAlert').hide();
                     $("."+linkData["id"]).remove();
                     form[0].reset();
@@ -1884,49 +2029,48 @@
 
 <body>
     <div layout:fragment="content" class="main-content">
- 		<div class="flex-spacing">
- 			<div>
-	    		<h2>
-		            <span style="color: var(--dark-grey)">Space:</span> [[${space?.name}]]
-		            <i class="fa fa-info-circle black" data-toggle="tooltip" data-html="true" data-placement="top" 
-						th:title="|Created on <span class='date'>${space.creationDate}</span> by ${space.createdBy}|"></i>
-		            <a th:href="@{'/staff/space/'+${space?.id}+'/edit'}"><span class="icon-edit"></span></a>
-		            <a th:href="@{'/exhibit/space/'+${space?.id}}" data-toggle="tooltip" title="Link to the public space"><span class="icon-link"></span></a>
-		            </h2>
-		        <p>[[${space.description}]]</p>
-		        <div class="inline-spacing">
-		        	<div class="dropdown">
-					  <button class="btn form-control btn-sm dropdown-toggle" type="button" id="incominglinks" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-					    Incoming space links
-					  </button>
-					  <div class="dropdown-menu" aria-labelledby="incominglinks">
-					    <span th:if="${#lists.isEmpty(linksToThisSpace)}"><small>There are no links to this space.</small></span>
-			            <div th:each="spaceLinks : ${linksToThisSpace}">          	
-			                <a th:href="@{'/staff/space/'+${spaceLinks.sourceSpace?.id}}" style="padding: .25rem; color: var(--secondary);"
-			                    th:id="${spaceLinks?.id}"><small>[[${spaceLinks.sourceSpace?.name}]]</small> <span class="icon-warning secondary unpublishedSpaceClass"
-                            th:if="${#strings.equals(spaceLinks.sourceSpace?.spaceStatus,'UNPUBLISHED')}" style="font-size: 100%; font-weight: 400;"></span></a>
-			            </div>
-					  </div>
-					</div>
-					
-					<div class="dropdown right-aligned">
-					  <button class="btn form-control btn-sm dropdown-toggle" type="button" id="outgoinglinks" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-					    Outgoing space links
-					  </button>
-					  <div class="dropdown-menu" aria-labelledby="outgoinglinks">
-					    <span th:if="${#lists.isEmpty(linksOnThisSpace)}"><small>There are no links from this space.</small></span>
-			            <div th:each="spaceLinks : ${linksOnThisSpace}">              	
-		                    <a th:href="@{'/staff/space/'+${spaceLinks.targetSpace?.id}}" style="padding: .25rem; color: var(--secondary);"
-		                        th:if="${spaceLinks.targetSpace != null}"
-		                        th:id="${spaceLinks?.id}"><small>[[${spaceLinks.targetSpace?.name}]]</small> <span class="icon-warning secondary unpublishedSpaceClass"
-                            th:if="${#strings.equals(spaceLinks.targetSpace?.spaceStatus,'UNPUBLISHED')}" style="font-size: 100%; font-weight: 400;"></span></a>
-						</div>
-					  </div>
-					</div>
-		        </div>
-		        
-		        
-	    	</div>
+        <div class="flex-spacing">
+            <div>
+                <h2>
+                    <span style="color: var(--dark-grey)">Space:</span> [[${space?.name}]]
+                    <i class="fa fa-info-circle black" data-toggle="tooltip" data-html="true" data-placement="top" 
+                        th:title="|Created on <span class='date'>${space.creationDate}</span> by ${space.createdBy}|"></i>
+                    <a th:href="@{'/staff/space/'+${space?.id}+'/edit'}"><span class="icon-edit"></span></a>
+                    <a th:href="@{'/exhibit/space/'+${space?.id}}" data-toggle="tooltip" title="Link to the public space"><span class="icon-link"></span></a>
+                </h2>
+                <p>[[${space.description}]]</p>
+                <div class="inline-spacing">
+                    <div class="dropdown">
+                        <button class="btn form-control btn-sm dropdown-toggle" type="button" id="incominglinks" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            Incoming space links
+                        </button>
+                        <div class="dropdown-menu" aria-labelledby="incominglinks">
+                            <span th:if="${#lists.isEmpty(linksToThisSpace)}"><small>There are no links to this space.</small></span>
+                            <div th:each="spaceLinks : ${linksToThisSpace}">          	
+                                <a th:href="@{'/staff/space/'+${spaceLinks.sourceSpace?.id}}" style="padding: .25rem; color: var(--secondary);"
+                                    th:id="${spaceLinks?.id}"><small>[[${spaceLinks.sourceSpace?.name}]]</small> <span class="icon-warning secondary unpublishedSpaceClass"
+                                    th:if="${#strings.equals(spaceLinks.sourceSpace?.spaceStatus,'UNPUBLISHED')}" style="font-size: 100%; font-weight: 400;"></span></a>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="dropdown right-aligned">
+                        <button class="btn form-control btn-sm dropdown-toggle" type="button" id="outgoinglinks" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            Outgoing space links
+                        </button>
+                        <div class="dropdown-menu" aria-labelledby="outgoinglinks">
+                            <span th:if="${#lists.isEmpty(linksOnThisSpace)}"><small>There are no links from this space.</small></span>
+                            <div th:each="spaceLinks : ${linksOnThisSpace}">              	
+                                <a th:href="@{'/staff/space/'+${spaceLinks.targetSpace?.id}}" style="padding: .25rem; color: var(--secondary);"
+                                    th:if="${spaceLinks.targetSpace != null}"
+                                    th:id="${spaceLinks?.id}"><small>[[${spaceLinks.targetSpace?.name}]]</small> <span class="icon-warning secondary unpublishedSpaceClass"
+                                    th:if="${#strings.equals(spaceLinks.targetSpace?.spaceStatus,'UNPUBLISHED')}" style="font-size: 100%; font-weight: 400;"></span></a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                
+                
+            </div>
 	    	<div>
                 <label style="margin-right: 10px;">Space Status</label> 
                 <form method="POST" th:action="@{'/staff/space/'+${space?.id}+'/status'}">
@@ -2063,7 +2207,20 @@ <h5 class="alert-heading">Create new Space Link</h5>
 	                        <label>Image</label>
 	                    </div>
 	                    <div class="col-sm-8">
+							<input type="radio" id="space-chooseFromLocal" name="uploadRadioBtn" checked />
+	                    		<small>Upload Image: </small>
 	                        <input type="file" class="form-control-sm-xs" name="spaceLinkImage" id="spaceLinkImage" style="width: inherit">
+	                        <input type="radio" id="space-chooseFromExisting" name="uploadRadioBtn" />
+	                        <div>
+								<small>Choose from existing: </small>
+								<select id="space-imageId" name="space-imageId" class="form-control-xs target"
+									style="height: 50px; width: 200px;">
+									<option selected value="">Choose from existing</option>
+								</select>
+							</div>
+							<div>
+								<span id="selectedImage" width="200px"></span>
+							</div>
 	                    </div>
 	                </div>
 	                <p class="mt-5 text-center">
@@ -2146,7 +2303,25 @@ <h5 class="alert-heading">Create new Module Link</h5>
 	                        <label>Image</label>
 	                    </div>
 	                    <div class="col-sm-8">
+	                        
+	                        
+ 	                        <input type="radio" id="module-chooseFromLocal" name="uploadRadioBtn" checked />
+	                    		<small>Upload Image: </small>
 	                        <input type="file" class="form-control-sm" name="moduleLinkImage" id="moduleLinkImage" style="width: inherit">
+	                        <input type="radio" id="module-chooseFromExisting" name="uploadRadioBtn" />
+	                        <div>
+								<small>Choose from existing: </small>
+								<select id="module-imageId" name="module-imageId"
+									class="form-control-xs target"
+									style="height: 50px; width: 200px;">
+									<option selected value="">Choose from existing</option>
+								</select>
+							</div>
+							<div>
+								<span id="selectedImage" width="200px"></span>
+							</div>
+							
+							 
 	                    </div>
 	                </div>
 	                <p class="mt-5 text-center">
@@ -2225,7 +2400,21 @@ <h5 class="alert-heading">Create new External Link</h5>
 	                        <label>Image</label>
 	                    </div>
 	                    <div class="col-sm-8">
+	                    	<input type="radio" id="externalLink-chooseFromLocal" name="uploadRadioBtn" checked />
+	                    		<small>Upload Image: </small>
 	                        <input type="file" class="form-control-sm" name="externalLinkImage" id="externalLinkImage" style="width: inherit">
+	                        <input type="radio" id="externalLink-chooseFromExisting" name="uploadRadioBtn" />
+	                        <div>
+								<small>Choose from existing: </small>
+								<select id="externalLink-imageId" name="externalLink-imageId"
+									class="form-control-xs target"
+									style="height: 50px; width: 200px;">
+									<option selected value="">Choose from existing</option>
+								</select>
+							</div>
+							<div>
+								<span id="selectedImage" width="200px"></span>
+							</div>
 	                    </div>
 	                </div>
 	                <p class="mt-5 text-center">
@@ -2476,8 +2665,7 @@ <h6 class="alert-heading">
                     </div>
                     <div class="row">
                         <div class="col-sm-4" style="padding-right: 0;">
-                            <label>Linked
-                                    Modules:</label>
+                            <label>Linked Modules:</label>
                         </div>
                         <div class="col-sm-8">
                             <select id="moduleLinkIdEdit"
diff --git a/vspace/src/main/webapp/resources/extra/Home.css b/vspace/src/main/webapp/resources/extra/Home.css
index 6c9122895..3dd965db9 100644
--- a/vspace/src/main/webapp/resources/extra/Home.css
+++ b/vspace/src/main/webapp/resources/extra/Home.css
@@ -682,7 +682,7 @@
 	right: 2.5%;
 	left: 2.5%;
 	bottom: 0;
-	z-index: 9999;
+	z-index: 1050;
 	overflow-y: scroll;
 	background: white;
 	padding: 25px;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/config/ExhibitionLanguageConfigTest.java b/vspace/src/test/java/edu/asu/diging/vspace/config/ExhibitionLanguageConfigTest.java
index 2fa961f49..8ace40c56 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/config/ExhibitionLanguageConfigTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/config/ExhibitionLanguageConfigTest.java
@@ -12,6 +12,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.print.DocFlavor.STRING;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManagerTest.java
index a4bf75d26..8644200f1 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManagerTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManagerTest.java
@@ -101,11 +101,8 @@ public class ContentBlockManagerTest {
     private ReferenceManager refManager;
 
     @Mock
-    private ChoiceContentBlockRepository choiceBlockRepo;
-    
-    @Mock
-    private VideoContentBlockRepository videoBlockRepo;
-
+    private SlideRepository slideRepo;
+   
     @Mock
     private IVideoFactory videoFactory;
     
@@ -133,6 +130,36 @@ public class ContentBlockManagerTest {
     @Mock
     private ChoiceBlockFactory choiceBlockFactory;
 
+    @Mock
+    private IImageBlockFactory imageBlockFactory;
+
+    @Mock
+    private SpaceBlockFactory spaceBlockFactory;
+
+    @Mock
+    private ChoiceContentBlockRepository choiceBlockRepo;
+
+    @Mock
+    private VideoContentBlockRepository videoBlockRepo;
+
+    @Mock
+    private IVideoFactory videoFactory;
+
+    @Mock
+    private ImageRepository imageRepo;
+
+    @Mock
+    private IImageFactory imageFactory;
+
+    @Mock
+    private ITextBlockFactory textBlockFactory;
+
+    @Mock
+    private ChoiceBlockFactory choiceBlockFactory;
+
+    @Mock
+    private IVideoBlockFactory videoBlockFactory;
+
     @Mock
     private VideoRepository videoRepo;
 
@@ -408,6 +435,7 @@ public void test_createBiblioBlock_success() {
     @Test
     public void test_updateContentOrder_success() throws BlockDoesNotExistException {
         ContentBlock firstContentBlock = new ContentBlock();
+        ISlide slide = firstContentBlock.getSlide();
         firstContentBlock.setId("contentBlockId1");
         firstContentBlock.setContentOrder(Integer.valueOf(3));
 
@@ -422,7 +450,7 @@ public void test_updateContentOrder_success() throws BlockDoesNotExistException
         when(contentBlockRepository.findById("contentBlockId1")).thenReturn(Optional.of(contentBlock));
         when(contentBlockRepository.findById("contentBlockId2")).thenReturn(Optional.of(contentBlock1));
 
-        managerToTest.updateContentOrder(contentBlocks);
+        managerToTest.updateContentOrder(contentBlocks,slide);
         assertEquals(Integer.valueOf(3), contentBlock.getContentOrder());
         assertEquals(Integer.valueOf(4), contentBlock1.getContentOrder());
 
@@ -436,6 +464,7 @@ public void test_updateContentOrder_success() throws BlockDoesNotExistException
     @Test(expected = BlockDoesNotExistException.class)
     public void test_updateContentOrder_forNonExistentId() throws BlockDoesNotExistException {
         ContentBlock contentBlock1 = new ContentBlock();
+        ISlide slide = contentBlock1.getSlide();
         contentBlock1.setId("notARealId");
         contentBlock1.setContentOrder(Integer.valueOf(1));
 
@@ -443,7 +472,7 @@ public void test_updateContentOrder_forNonExistentId() throws BlockDoesNotExistE
         contentBlocks.add(contentBlock1);
 
         when(contentBlockRepository.findById("notARealId")).thenReturn(Optional.empty());
-        managerToTest.updateContentOrder(contentBlocks);
+        managerToTest.updateContentOrder(contentBlocks,slide);
     }
 
     @Test
@@ -461,11 +490,13 @@ public void test_getAllContentBlocks_success() throws BlockDoesNotExistException
         contentBlocks.add(firstContentBlock);
         slide.setContents(contentBlocks);
         when(slideManager.getSlide(slideId)).thenReturn(slide);
+        when(slideRepo.findById("notARealId")).thenReturn(Optional.empty());
 
         List<IContentBlock> returnedContentBlock = managerToTest.getAllContentBlocks(slideId);
         assertEquals(returnedContentBlock.get(0).getId(), contentBlockIdString);
         assertEquals(returnedContentBlock.size(), contentBlocks.size());
         assertEquals(returnedContentBlock.get(0).getContentOrder(), Integer.valueOf(3));
+        assertTrue(!returnedContentBlock.isEmpty());
 
     }
 
@@ -478,6 +509,14 @@ public void test_deleteChoiceBlockById_nullBlockId() throws BlockDoesNotExistExc
 
     }
 
+    @Test
+    public void test_deleteImagetBlockById_whenIdIsNull() throws BlockDoesNotExistException {
+        String imageBlockId = null;
+        managerToTest.deleteImageBlockById(null, "slideId_1");
+        Mockito.verify(imageBlockRepo, Mockito.never()).deleteById(imageBlockId);
+
+    }
+
     @Test(expected = BlockDoesNotExistException.class)
     public void test_deleteChoiceBlockById_missingContentBlock() throws BlockDoesNotExistException {
         String blockId = "realBlockId";
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManagerTest.java
index f7ec5b68c..ae0de17ce 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManagerTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManagerTest.java
@@ -14,11 +14,16 @@
 
 import edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository;
 import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
+import edu.asu.diging.vspace.core.data.ImageRepository;
+import edu.asu.diging.vspace.core.exception.FileStorageException;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
 import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
+import edu.asu.diging.vspace.core.factory.IImageFactory;
+import edu.asu.diging.vspace.core.file.IStorageEngine;
 import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.IVSImage;
@@ -51,22 +56,35 @@ public class ExternalLinkManagerTest {
 
     @Mock
     private IExternalLinkDisplayFactory externalLinkDisplayFactory;
+    
+    @Mock
+    private IImageFactory imageFactory;
+    
+    @Mock
+    private ImageRepository imageRepo;
+    
+    @Mock
+    private IStorageEngine storage;
 
     @InjectMocks
     private ExternalLinkManager managerToTest = new ExternalLinkManager();
 
     private String spaceId1;
     private String externalLinkURL;
+    private String imageId, imageFileName, extDisplayLinkId;
 
     @Before
     public void init() {
         MockitoAnnotations.initMocks(this);
         spaceId1 = "SPA000000014";
         externalLinkURL = "www.google.com";
+        imageId = "IMG00000001";
+        imageFileName = "Space Image 1";
+        extDisplayLinkId = "EXL001";
     }
 
     @Test
-    public void test_createLink_success() throws SpaceDoesNotExistException, ImageCouldNotBeStoredException {
+    public void test_createLink_success() throws SpaceDoesNotExistException, ImageCouldNotBeStoredException,ImageDoesNotExistException,FileStorageException {
 
         Space space = new Space();
         space.setId(spaceId1);
@@ -104,7 +122,7 @@ public void test_createLink_success() throws SpaceDoesNotExistException, ImageCo
         Mockito.when(externalLinkRepo.save((ExternalLink) externalLink)).thenReturn((ExternalLink)externalLink);
         Mockito.when(externalLinkDisplayRepo.save((ExternalLinkDisplay)externalDisplayLink)).thenReturn((ExternalLinkDisplay)externalDisplayLink);
 
-        IExternalLinkDisplay savedExternalLinkDisplay1 = managerToTest.createLink("New External Link", spaceId1, 10, 30, 40, "EXL001", "New External Link", DisplayType.ARROW, null, null,null);
+        IExternalLinkDisplay savedExternalLinkDisplay1 = managerToTest.createLink("New External Link", spaceId1, 10, 30, 40, "EXL001", "New External Link","New External Link Desc", DisplayType.ARROW, null, null,null);
         Assert.assertEquals(externalDisplayLink.getId(), savedExternalLinkDisplay1.getId());
         Assert.assertEquals(externalDisplayLink.getName(), savedExternalLinkDisplay1.getName());
         Assert.assertEquals(new Double(externalDisplayLink.getPositionX()), new Double(savedExternalLinkDisplay1.getPositionX()));
@@ -114,10 +132,49 @@ public void test_createLink_success() throws SpaceDoesNotExistException, ImageCo
         Assert.assertEquals(externalDisplayLink.getExternalLink(), savedExternalLinkDisplay1.getExternalLink());
         Assert.assertEquals(externalDisplayLink.getExternalLink().getTarget().getValue(), savedExternalLinkDisplay1.getExternalLink().getTarget().getValue());
         Mockito.verify(externalLinkDisplayRepo).save((ExternalLinkDisplay)externalDisplayLink);
+      //For externalLink as Image 
+        IVSImage extImage = new VSImage();
+        extImage.setId(imageId);
+        extImage.setFilename(imageFileName);
+        extImage.setHeight(200);
+        extImage.setWidth(400);
+        
+        IExternalLinkDisplay extDisplayLinkImage = new ExternalLinkDisplay();
+        extDisplayLinkImage.setId(extDisplayLinkId);
+        extDisplayLinkImage.setPositionX(10);
+        extDisplayLinkImage.setPositionY(30);
+        extDisplayLinkImage.setRotation(40);
+        extDisplayLinkImage.setType(DisplayType.IMAGE);
+        extDisplayLinkImage.setImage(extImage);
+        extDisplayLinkImage.setExternalLink(externalLink);
+        Mockito.when(externalLinkFactory.createExternalLink("New Module Link", space)).thenReturn(externalLink);
+        
+        Mockito.when(externalLinkDisplayFactory.createExternalLinkDisplay(externalLink)).thenReturn(extDisplayLinkImage);
+        
+        Mockito.when(imageFactory.createImage(Mockito.anyString(), Mockito.anyString())).thenReturn(extImage);
+        Mockito.when(imageRepo.save((VSImage) extImage)).thenReturn((VSImage) extImage);
+        Mockito.when(storage.storeFile(new byte[20], imageFileName, extImage.getId())).thenReturn("Dummy File Path");
+        
+        Mockito.when(externalLinkRepo.save((ExternalLink) externalLink)).thenReturn((ExternalLink)externalLink);
+        Mockito.when(externalLinkDisplayRepo.save((ExternalLinkDisplay)extDisplayLinkImage)).thenReturn((ExternalLinkDisplay)extDisplayLinkImage);
+        
+        IExternalLinkDisplay savedExternalLinkDisplay2 = managerToTest.createLink("New External Link", spaceId1, 10, 30, 40, extDisplayLinkId, "New External Link", "New External Link Desc", DisplayType.IMAGE, new byte[20], imageFileName, null);
+        Assert.assertEquals(extDisplayLinkImage.getId(), savedExternalLinkDisplay2.getId());
+        Assert.assertEquals(extDisplayLinkImage.getName(), savedExternalLinkDisplay2.getName());
+        Assert.assertEquals(new Double(extDisplayLinkImage.getPositionX()), new Double(savedExternalLinkDisplay2.getPositionX()));
+        Assert.assertEquals(new Double(extDisplayLinkImage.getPositionY()), new Double(savedExternalLinkDisplay2.getPositionY()));
+        Assert.assertEquals(extDisplayLinkImage.getRotation(), savedExternalLinkDisplay2.getRotation());
+        Assert.assertEquals(extDisplayLinkImage.getExternalLink().getId(), savedExternalLinkDisplay2.getExternalLink().getId());
+        Assert.assertEquals(extDisplayLinkImage.getType(), savedExternalLinkDisplay2.getType());
+        Assert.assertEquals(extDisplayLinkImage.getExternalLink().getSpace(), savedExternalLinkDisplay2.getExternalLink().getSpace());
+        Assert.assertEquals(extDisplayLinkImage.getImage().getHeight(), savedExternalLinkDisplay2.getImage().getHeight());
+        Assert.assertEquals(extDisplayLinkImage.getImage().getWidth(), savedExternalLinkDisplay2.getImage().getWidth());
+        Assert.assertEquals(extDisplayLinkImage.getImage().getId(), savedExternalLinkDisplay2.getImage().getId());
+        Mockito.verify(externalLinkDisplayRepo).save((ExternalLinkDisplay)extDisplayLinkImage);
     }
 
     @Test
-    public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
+    public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException {
         ISpace space = new Space();
         space.setId(spaceId1);
         IVSImage spaceImage = new VSImage();
@@ -154,9 +211,9 @@ public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoe
         Mockito.when(externalLinkDisplayRepo.findById(externalLinkDisplay.getId())).thenReturn(mockExternalLinkDisplay);
 
         Mockito.when(externalLinkRepo.save((ExternalLink) externalLink)).thenReturn((ExternalLink)externalLink);
-        Mockito.when(externalLinkDisplayRepo.save((ExternalLinkDisplay)externalLinkDisplay)).thenReturn((ExternalLinkDisplay)externalLinkDisplay);
+        Mockito.when(externalLinkDisplayRepo.save((ExternalLinkDisplay) externalLinkDisplay)).thenReturn((ExternalLinkDisplay)externalLinkDisplay);
 
-        IExternalLinkDisplay actualUpdatedLink = managerToTest.updateLink("TestExternalNew", spaceId1, 20, 40, 0, "www.google.com", "TestExternalNew", "EXL001", "EXLD001", DisplayType.ARROW, null, null,null);
+        IExternalLinkDisplay actualUpdatedLink = managerToTest.updateLink("TestExternalNew", spaceId1, 20, 40, 0, "www.google.com", "TestExternalNew",  "Test External Link Desc", "EXL001", "EXLD001", DisplayType.ARROW, null, null, null);
         Assert.assertEquals(externalLinkDisplay.getId(), actualUpdatedLink.getId());
         Assert.assertEquals(externalLinkDisplay.getName(), actualUpdatedLink.getName());
         Assert.assertEquals(new Double(externalLinkDisplay.getPositionX()), new Double(actualUpdatedLink.getPositionX()));
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ModuleLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ModuleLinkManagerTest.java
index 6b5090701..6dd256e7b 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ModuleLinkManagerTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ModuleLinkManagerTest.java
@@ -17,6 +17,7 @@
 import edu.asu.diging.vspace.core.data.display.ModuleLinkDisplayRepository;
 import edu.asu.diging.vspace.core.exception.FileStorageException;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.factory.IImageFactory;
@@ -59,12 +60,14 @@ public class ModuleLinkManagerTest {
     @Mock
     private IImageFactory imageFactory;
     
+    
     @Mock
     private ImageRepository imageRepo;
     
     @Mock
     private IStorageEngine storage;
 
+
     @Mock
     private IModuleLinkDisplayFactory moduleLinkDisplayFactory;
 
@@ -83,7 +86,7 @@ public void init() {
     }
 
     @Test
-    public void test_createLink_success() throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, FileStorageException {
+    public void test_createLink_success() throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, FileStorageException, ImageDoesNotExistException {
 
         Space space = new Space();
         space.setId(spaceId1);
@@ -123,7 +126,7 @@ public void test_createLink_success() throws SpaceDoesNotExistException, ImageCo
         Mockito.when(moduleLinkRepo.save((ModuleLink) moduleLink)).thenReturn((ModuleLink)moduleLink);
         Mockito.when(moduleLinkDisplayRepo.save((ModuleLinkDisplay)moduleDisplayLink)).thenReturn((ModuleLinkDisplay)moduleDisplayLink);
 
-        IModuleLinkDisplay savedModuleLinkDisplay1 = managerToTest.createLink("New Module Link", spaceId1, 10, 30, 40, "MOD001", "New Module Link", DisplayType.ARROW, null, null);
+        IModuleLinkDisplay savedModuleLinkDisplay1 = managerToTest.createLink("New Module Link", spaceId1, 10, 30, 40, "MOD001", "New Module Link", "New Module Link Desc",DisplayType.ARROW, null, null, null);
         Assert.assertEquals(moduleDisplayLink.getId(), savedModuleLinkDisplay1.getId());
         Assert.assertEquals(moduleDisplayLink.getName(), savedModuleLinkDisplay1.getName());
         Assert.assertEquals(new Double(moduleDisplayLink.getPositionX()), new Double(savedModuleLinkDisplay1.getPositionX()));
@@ -161,7 +164,7 @@ public void test_createLink_success() throws SpaceDoesNotExistException, ImageCo
         Mockito.when(moduleLinkRepo.save((ModuleLink) moduleLink)).thenReturn((ModuleLink)moduleLink);
         Mockito.when(moduleLinkDisplayRepo.save((ModuleLinkDisplay)moduleDisplayLinkImage)).thenReturn((ModuleLinkDisplay)moduleDisplayLinkImage);
 
-        IModuleLinkDisplay savedModuleLinkDisplay2 = managerToTest.createLink("New Module Link", spaceId1, 10, 30, 40, "MOD001", "New Module Link", DisplayType.IMAGE, new byte[20], imageFileName);
+        IModuleLinkDisplay savedModuleLinkDisplay2 = managerToTest.createLink("New Module Link", spaceId1, 10, 30, 40, "MOD001", "New Module Link", "New Module Link Desc", DisplayType.IMAGE, new byte[20], imageFileName, null);
         Assert.assertEquals(moduleDisplayLinkImage.getId(), savedModuleLinkDisplay2.getId());
         Assert.assertEquals(moduleDisplayLinkImage.getName(), savedModuleLinkDisplay2.getName());
         Assert.assertEquals(new Double(moduleDisplayLinkImage.getPositionX()), new Double(savedModuleLinkDisplay2.getPositionX()));
@@ -178,7 +181,7 @@ public void test_createLink_success() throws SpaceDoesNotExistException, ImageCo
     }
 
     @Test
-    public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
+    public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException {
         ISpace space = new Space();
         space.setId(spaceId1);
         IVSImage spaceImage = new VSImage();
@@ -235,7 +238,7 @@ public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoe
         Mockito.when(moduleLinkRepo.save((ModuleLink) moduleLink)).thenReturn((ModuleLink)moduleLink);
         Mockito.when(moduleLinkDisplayRepo.save((ModuleLinkDisplay)moduleLinkDisplay)).thenReturn((ModuleLinkDisplay)moduleLinkDisplayUpdated);
 
-        IModuleLinkDisplay actualUpdatedLink = managerToTest.updateLink("TestModuleEdited", spaceId1, 100, 300, 180, "MOD002", "TestModuleEdited", "MOL001", modDisplayLinkId, DisplayType.ALERT, null, null);
+        IModuleLinkDisplay actualUpdatedLink = managerToTest.updateLink("TestModuleEdited", spaceId1, 100, 300, 180, "MOD002", "TestModuleEdited","TestModuleEdited Desc", "MOL001", modDisplayLinkId, DisplayType.ALERT, null, null, null);
         Assert.assertEquals(moduleLinkDisplayUpdated.getId(), actualUpdatedLink.getId());
         Assert.assertEquals(moduleLinkDisplayUpdated.getName(), actualUpdatedLink.getName());
         Assert.assertEquals(new Double(moduleLinkDisplayUpdated.getPositionX()), new Double(actualUpdatedLink.getPositionX()));
@@ -254,7 +257,7 @@ public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoe
         moduleLinkDisplay.setImage(modImage);
         moduleLinkDisplayUpdated.setType(DisplayType.ARROW);
         
-        IModuleLinkDisplay actualUpdatedLink2 = managerToTest.updateLink("TestModuleEdited", spaceId1, 100, 300, 180, "MOD002", "TestModuleEdited", "MOL001", modDisplayLinkId, DisplayType.ALERT, null, null);
+        IModuleLinkDisplay actualUpdatedLink2 = managerToTest.updateLink("TestModuleEdited", spaceId1, 100, 300, 180, "MOD002", "TestModuleEdited","TestModuleEdited Desc", "MOL001", modDisplayLinkId, DisplayType.ALERT, null, null, null);
         Assert.assertEquals(moduleLinkDisplayUpdated.getId(), actualUpdatedLink2.getId());
         Assert.assertEquals(moduleLinkDisplayUpdated.getName(), actualUpdatedLink2.getName());
         Assert.assertEquals(new Double(moduleLinkDisplayUpdated.getPositionX()), new Double(actualUpdatedLink2.getPositionX()));
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceLinkManagerTest.java
index cad5a68de..1975e161f 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceLinkManagerTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceLinkManagerTest.java
@@ -12,13 +12,18 @@
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
+import edu.asu.diging.vspace.core.data.ImageRepository;
 import edu.asu.diging.vspace.core.data.SpaceLinkRepository;
 import edu.asu.diging.vspace.core.data.display.SpaceLinkDisplayRepository;
+import edu.asu.diging.vspace.core.exception.FileStorageException;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
+import edu.asu.diging.vspace.core.factory.IImageFactory;
 import edu.asu.diging.vspace.core.factory.ISpaceLinkFactory;
 import edu.asu.diging.vspace.core.factory.impl.SpaceLinkDisplayFactory;
+import edu.asu.diging.vspace.core.file.IStorageEngine;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.ISpaceLink;
 import edu.asu.diging.vspace.core.model.IVSImage;
@@ -30,6 +35,7 @@
 import edu.asu.diging.vspace.core.model.impl.Space;
 import edu.asu.diging.vspace.core.model.impl.SpaceLink;
 import edu.asu.diging.vspace.core.model.impl.VSImage;
+import edu.asu.diging.vspace.core.services.IImageService;
 
 public class SpaceLinkManagerTest {
     @Mock
@@ -49,11 +55,23 @@ public class SpaceLinkManagerTest {
 
     @Mock
     private SpaceLinkDisplayFactory spaceLinkDisplayFactory;
+    
+    @Mock
+    private IImageFactory imageFactory;
+    
+    @Mock
+    private IImageService imageService;
+    
+    @Mock
+    private ImageRepository imageRepo;
+    
+    @Mock
+    private IStorageEngine storage;
 
     @InjectMocks
     private SpaceLinkManager managerToTest = new SpaceLinkManager();
 
-    private String spaceId1, spaceId2, spaceId3, spaceLinkId1;
+    private String spaceId1, spaceId2, spaceId3, imageId, imageId2, imageFileName, spcDisplayLinkId, spaceLinkId1;
 
     @Before
     public void init() {
@@ -61,11 +79,15 @@ public void init() {
         spaceId1 = "SPA000000001";
         spaceId2 = "SPA000000002";
         spaceId3 = "SPA000000003";
+        imageId = "IMG00000001";
+        imageId2 = "IMG00000002";
+        imageFileName = "Space Image 1";
+        spcDisplayLinkId = "SPLD001";
         spaceLinkId1 = "SPL00000001";
     }
 
     @Test
-    public void test_createLink_success() throws SpaceDoesNotExistException, ImageCouldNotBeStoredException {
+    public void test_createLink_success() throws SpaceDoesNotExistException, ImageCouldNotBeStoredException ,ImageDoesNotExistException, FileStorageException{
 
         ISpace space = new Space();
         space.setId(spaceId1);
@@ -106,7 +128,7 @@ public void test_createLink_success() throws SpaceDoesNotExistException, ImageCo
         Mockito.when(spaceLinkRepo.save((SpaceLink) spaceLink)).thenReturn((SpaceLink)spaceLink);
         Mockito.when(spaceLinkDisplayRepo.save((SpaceLinkDisplay)spaceDisplayLink)).thenReturn((SpaceLinkDisplay)spaceDisplayLink);
 
-        ISpaceLinkDisplay savedSpaceLinkDisplay = managerToTest.createLink("New Space Link", spaceId1, 10, 30, 40, spaceId2, "New Space Link", DisplayType.ARROW, null, null);
+        ISpaceLinkDisplay savedSpaceLinkDisplay = managerToTest.createLink("New Space Link", spaceId1, 10, 30, 40, spaceId2, "New Space Link", "New Space Link Desc", DisplayType.ARROW, null, null, null);
         Assert.assertEquals(spaceDisplayLink.getId(), savedSpaceLinkDisplay.getId());
         Assert.assertEquals(spaceDisplayLink.getName(), savedSpaceLinkDisplay.getName());
         Assert.assertEquals(new Double(spaceDisplayLink.getPositionX()), new Double(savedSpaceLinkDisplay.getPositionX()));
@@ -117,6 +139,63 @@ public void test_createLink_success() throws SpaceDoesNotExistException, ImageCo
         Assert.assertEquals(spaceDisplayLink.getLink().getTargetSpace(), savedSpaceLinkDisplay.getLink().getTargetSpace());
         Mockito.verify(spaceLinkDisplayRepo).save((SpaceLinkDisplay)spaceDisplayLink);
     }
+    
+    @Test
+    public void test_createLinkWithExistingImage_success() throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, ImageDoesNotExistException, FileStorageException {
+        
+        ISpace space = new Space();
+        space.setId(spaceId1);
+        
+        ISpaceLink spaceLink = new SpaceLink();
+        spaceLink.setId("SPL001");
+        
+        Mockito.when(spaceManager.getSpace(spaceId1)).thenReturn(space);
+        Mockito.when(spaceLinkRepo.save((SpaceLink)spaceLink)).thenReturn((SpaceLink) spaceLink);
+        Mockito.when(spaceManager.getSpace(spaceId1)).thenReturn(space);
+        Mockito.when(spaceLinkFactory.createSpaceLink("New Space Link", space)).thenReturn(spaceLink);
+
+        ISpace target = new Space();
+        target.setId(spaceId2);
+        Mockito.when(spaceManager.getSpace(spaceId2)).thenReturn(target);
+
+        spaceLink.setTargetSpace(target);
+        IVSImage spcImage = new VSImage();
+        spcImage.setId(imageId);
+        spcImage.setFilename(imageFileName);
+        spcImage.setHeight(200);
+        spcImage.setWidth(400);
+        
+        ISpaceLinkDisplay spaceDisplayLinkImage = new SpaceLinkDisplay();
+        spaceDisplayLinkImage.setId(spcDisplayLinkId);
+        spaceDisplayLinkImage.setPositionX(10);
+        spaceDisplayLinkImage.setPositionY(30);
+        spaceDisplayLinkImage.setRotation(40);
+        spaceDisplayLinkImage.setType(DisplayType.IMAGE);
+        spaceDisplayLinkImage.setImage(spcImage);
+        Mockito.when(spaceLinkFactory.createSpaceLink("New Module Link", space)).thenReturn(spaceLink);
+        spaceDisplayLinkImage.setLink(spaceLink);
+        Mockito.when(spaceLinkDisplayFactory.createSpaceLinkDisplay(spaceLink)).thenReturn(spaceDisplayLinkImage);
+        Mockito.when(imageFactory.createImage(Mockito.anyString(), Mockito.anyString())).thenReturn(spcImage);
+        Mockito.when(imageRepo.save((VSImage) spcImage)).thenReturn((VSImage) spcImage);
+        Mockito.when(storage.storeFile(new byte[20], imageFileName, spcImage.getId())).thenReturn("Dummy File Path");
+        Mockito.when(spaceLinkRepo.save((SpaceLink) spaceLink)).thenReturn((SpaceLink)spaceLink);
+        Mockito.when(spaceLinkDisplayRepo.save((SpaceLinkDisplay)spaceDisplayLinkImage)).thenReturn((SpaceLinkDisplay)spaceDisplayLinkImage);
+        
+        ISpaceLinkDisplay savedSpaceLinkDisplay2 = managerToTest.createLink("New Space Link", spaceId1, 10, 30, 40, spaceId2, "New Space Link", "New Space Link Desc", DisplayType.IMAGE, new byte[20], imageFileName, null);
+        Assert.assertEquals(spaceDisplayLinkImage.getId(), savedSpaceLinkDisplay2.getId());
+        Assert.assertEquals(spaceDisplayLinkImage.getName(), savedSpaceLinkDisplay2.getName());
+        Assert.assertEquals(spaceDisplayLinkImage.getDescription(), savedSpaceLinkDisplay2.getDescription());
+        Assert.assertEquals(new Double(spaceDisplayLinkImage.getPositionX()), new Double(savedSpaceLinkDisplay2.getPositionX()));
+        Assert.assertEquals(new Double(spaceDisplayLinkImage.getPositionY()), new Double(savedSpaceLinkDisplay2.getPositionY()));
+        Assert.assertEquals(spaceDisplayLinkImage.getRotation(), savedSpaceLinkDisplay2.getRotation());
+        Assert.assertEquals(spaceDisplayLinkImage.getLink().getId(), savedSpaceLinkDisplay2.getLink().getId());
+        Assert.assertEquals(spaceDisplayLinkImage.getType(), savedSpaceLinkDisplay2.getType());
+        Assert.assertEquals(spaceDisplayLinkImage.getLink().getTargetSpace(), savedSpaceLinkDisplay2.getLink().getTargetSpace());
+        Assert.assertEquals(spaceDisplayLinkImage.getImage().getHeight(), savedSpaceLinkDisplay2.getImage().getHeight());
+        Assert.assertEquals(spaceDisplayLinkImage.getImage().getWidth(), savedSpaceLinkDisplay2.getImage().getWidth());
+        Assert.assertEquals(spaceDisplayLinkImage.getImage().getId(), savedSpaceLinkDisplay2.getImage().getId());
+        Mockito.verify(spaceLinkDisplayRepo).save((SpaceLinkDisplay)spaceDisplayLinkImage);
+    }
 
     @Test
     public void test_deleteLink_linkPresent() {
@@ -157,7 +236,7 @@ public void test_deleteLink_linkPresent() {
     }
 
     @Test
-    public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
+    public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException , ImageDoesNotExistException{
         ISpace space = new Space();
         space.setId(spaceId1);
         IVSImage spaceImage = new VSImage();
@@ -219,7 +298,7 @@ public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoe
         Mockito.when(spaceLinkRepo.save((SpaceLink) spaceLink)).thenReturn((SpaceLink)spaceLink);
         Mockito.when(spaceLinkDisplayRepo.save((SpaceLinkDisplay)spaceLinkDisplay)).thenReturn((SpaceLinkDisplay)spaceLinkDisplayUpdated);
 
-        ISpaceLinkDisplay actualUpdatedLink = managerToTest.updateLink("TestSpaceEdited", spaceId1, 100, 300, 180, spaceId3, "TestSpaceEdited", "SPL002", "SPLD001", DisplayType.ALERT, null, null);
+        ISpaceLinkDisplay actualUpdatedLink = managerToTest.updateLink("TestSpaceEdited", spaceId1, 100, 300, 180, spaceId3, "TestSpaceEdited","New Space Link Desc", "SPL002", "SPLD001", DisplayType.ALERT, null, null, null);
         Assert.assertEquals(spaceLinkDisplayUpdated.getId(), actualUpdatedLink.getId());
         Assert.assertEquals(spaceLinkDisplayUpdated.getName(), actualUpdatedLink.getName());
         Assert.assertEquals(new Double(spaceLinkDisplayUpdated.getPositionX()), new Double(actualUpdatedLink.getPositionX()));
@@ -228,6 +307,72 @@ public void test_updateLink_success() throws SpaceDoesNotExistException, LinkDoe
         Assert.assertEquals(spaceLinkDisplayUpdated.getType(), actualUpdatedLink.getType());
     }
     
+    @Test
+    public void test_updateLinkWithExistingImage_success() throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException {
+        IVSImage spcImage = new VSImage();
+        spcImage.setId(imageId2);
+        spcImage.setFilename(imageFileName);
+        spcImage.setHeight(300);
+        spcImage.setWidth(600);
+        
+        ISpace space = new Space();
+        space.setId(spaceId1);
+        ISpace target = new Space();
+        target.setId(spaceId2);
+        
+        ISpaceLink spaceLink = new SpaceLink();
+        spaceLink.setId("SPL002");
+        spaceLink.setSourceSpace(space);
+        spaceLink.setTargetSpace(target);
+        
+        SpaceLinkDisplay spaceLinkDisplay = new SpaceLinkDisplay();
+        spaceLinkDisplay.setId("SPLD001");
+        spaceLinkDisplay.setLink(spaceLink);
+
+        spaceLinkDisplay.setName("TestSpace");
+        spaceLinkDisplay.setPositionX(10);
+        spaceLinkDisplay.setPositionY(30);
+        spaceLinkDisplay.setPositionY(20);
+        spaceLinkDisplay.setType(DisplayType.ARROW);
+        
+        SpaceLinkDisplay spaceLinkDisplayUpdated = spaceLinkDisplay;
+        spaceLinkDisplayUpdated.setName("TestSpaceEdited");
+        spaceLinkDisplayUpdated.setPositionX(100);
+        spaceLinkDisplayUpdated.setPositionY(300);
+        spaceLinkDisplayUpdated.setRotation(180);
+        spaceLinkDisplayUpdated.setType(DisplayType.IMAGE);
+        spaceLinkDisplayUpdated.setImage(spcImage);
+        
+        ISpaceDisplay displayAttributes = new SpaceDisplay();
+        displayAttributes.setHeight(700);
+        displayAttributes.setWidth(1300);
+        
+        Optional<SpaceLink> mockSpaceLink = Optional.of((SpaceLink)spaceLink);
+        Mockito.when(spaceLinkRepo.findById(spaceLink.getId())).thenReturn(mockSpaceLink);
+        Optional<SpaceLinkDisplay> mockSpaceLinkDisplay = Optional.of((SpaceLinkDisplay)spaceLinkDisplay);
+        Mockito.when(spaceLinkDisplayRepo.findById(spaceLinkDisplay.getId())).thenReturn(mockSpaceLinkDisplay);
+        
+        Mockito.when(spaceManager.getSpace(spaceId1)).thenReturn(space);
+        Mockito.when(spaceDisplayManager.getBySpace(space)).thenReturn(displayAttributes);
+        Mockito.when(spaceLinkRepo.save((SpaceLink) spaceLink)).thenReturn((SpaceLink)spaceLink);
+        Mockito.when(spaceLinkDisplayRepo.save((SpaceLinkDisplay)spaceLinkDisplay)).thenReturn((SpaceLinkDisplay)spaceLinkDisplayUpdated);
+        Mockito.when(imageService.getImageById(Mockito.anyString())).thenReturn(spcImage);
+        
+        ISpaceLinkDisplay savedSpaceLinkDisplay2 = managerToTest.updateLink("Updated Space Link", spaceId1, 10, 30, 40, spaceId2, "Updated Space Link", "TestSpaceEdited Desc", "SPL002", "SPLD001", DisplayType.IMAGE, null, null, imageId2);
+        Assert.assertEquals(spaceLinkDisplayUpdated.getId(), savedSpaceLinkDisplay2.getId());
+        Assert.assertEquals(spaceLinkDisplayUpdated.getName(), savedSpaceLinkDisplay2.getName());
+        Assert.assertEquals(spaceLinkDisplayUpdated.getDescription(), savedSpaceLinkDisplay2.getDescription());
+        Assert.assertEquals(new Double(spaceLinkDisplayUpdated.getPositionX()), new Double(savedSpaceLinkDisplay2.getPositionX()));
+        Assert.assertEquals(new Double(spaceLinkDisplayUpdated.getPositionY()), new Double(savedSpaceLinkDisplay2.getPositionY()));
+        Assert.assertEquals(spaceLinkDisplayUpdated.getRotation(), savedSpaceLinkDisplay2.getRotation());
+        Assert.assertEquals(spaceLinkDisplayUpdated.getLink().getId(), savedSpaceLinkDisplay2.getLink().getId());
+        Assert.assertEquals(spaceLinkDisplayUpdated.getType(), savedSpaceLinkDisplay2.getType());
+        Assert.assertEquals(spaceLinkDisplayUpdated.getLink().getTargetSpace(), savedSpaceLinkDisplay2.getLink().getTargetSpace());
+        Assert.assertEquals(spaceLinkDisplayUpdated.getImage().getHeight(), savedSpaceLinkDisplay2.getImage().getHeight());
+        Assert.assertEquals(spaceLinkDisplayUpdated.getImage().getWidth(), savedSpaceLinkDisplay2.getImage().getWidth());
+        Assert.assertEquals(spaceLinkDisplayUpdated.getImage().getId(), savedSpaceLinkDisplay2.getImage().getId());
+    }
+    
     @Test
     public void test_deleteSpaceLinkWithSourceAsNull_present() {
         SpaceLink spaceLink = new SpaceLink();