diff --git a/config/module.config.php b/config/module.config.php
index 63f5f66..808942b 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -20,6 +20,7 @@ return [
     'DefaultSettings' => [
         'ImageViewerBlockForm' => [
             'title' => '',
+            'renderSourceLink' => true,
             'width' => 600,
             'zoom_type' => '',
             'wrapStyle' => 'overflow-y: hidden;display: flex;flex-direction: column;justify-content: center;',
diff --git a/src/Form/ImageViewerBlockForm.php b/src/Form/ImageViewerBlockForm.php
index 53d45ca..df185a5 100644
--- a/src/Form/ImageViewerBlockForm.php
+++ b/src/Form/ImageViewerBlockForm.php
@@ -10,15 +10,6 @@ class ImageViewerBlockForm extends Form
 	public function init()
 	{
 
-		$this->add([
-			'name' => 'o:block[__blockIndex__][o:data][title]',
-			'type' => Element\Text::class,
-      'options' => [
-				'label' => 'Title (option)',
-			]
-		]);
-
-
 		$this->add([
 			'name' => 'o:block[__blockIndex__][o:data][width]',
       'type' => Element\Select::class,
@@ -37,17 +28,23 @@ class ImageViewerBlockForm extends Form
       ],
 		]);
 
-		/*
 		$this->add([
 		    'type' => Element\Checkbox::class,
-		    'name' => 'o:block[__blockIndex__][o:data][zoom]',
+		    'name' => 'o:block[__blockIndex__][o:data][renderSourceLink]',
 		    'options' => [
-		        'label' => 'Zoom',
+		        'label' => 'Display a link to the item',
 		        //'use_hidden_element' => true,
 		        'checked_value' => true,
 		        'unchecked_value' => false,
 		    ],
 		]);
-		*/
+
+		$this->add([
+			'name' => 'o:block[__blockIndex__][o:data][title]',
+			'type' => Element\Text::class,
+      'options' => [
+				'label' => 'Sub-title',
+			]
+		]);
 	}
 }
diff --git a/src/Site/BlockLayout/ImageViewer.php b/src/Site/BlockLayout/ImageViewer.php
index 0bca3b6..30e7529 100644
--- a/src/Site/BlockLayout/ImageViewer.php
+++ b/src/Site/BlockLayout/ImageViewer.php
@@ -50,7 +50,7 @@ class ImageViewer extends AbstractBlockLayout
 			'o:block[__blockIndex__][o:data][title]' => $data['title'],
 			'o:block[__blockIndex__][o:data][width]' => $data['width'],
       'o:block[__blockIndex__][o:data][zoom_type]' => $data['zoom_type'],
-      //'o:block[__blockIndex__][o:data][zoom]' => $data['zoom'],
+      'o:block[__blockIndex__][o:data][renderSourceLink]' => $data['renderSourceLink'],
 		]);
 		$form->prepare();
 
@@ -78,6 +78,8 @@ class ImageViewer extends AbstractBlockLayout
 		return $view->partial('common/block-layout/imageViewer', [
 			'zoom_type' => $block->dataValue('zoom_type'),
 			'title' => $block->dataValue('title'),
+      'item_url' => $attachments[0]->item()->url(),
+      'renderSourceLink' => $block->dataValue('renderSourceLink'),
 			'width' => $block->dataValue('width'),
 			'image' => $media->primaryMedia()->thumbnailUrl('large'),
       'id' => 'iv-' . ++$id,
diff --git a/view/common/block-layout/imageViewer.phtml b/view/common/block-layout/imageViewer.phtml
index 2be22db..965823c 100644
--- a/view/common/block-layout/imageViewer.phtml
+++ b/view/common/block-layout/imageViewer.phtml
@@ -15,35 +15,23 @@
 	}
 ?>
 
-	<?php
-		if ($title !== false && $title !== "") {
-			$title = sprintf('<p id="wheelzoom-title">%s</p>', $title);
-		} else {
-			$title = false;
-		}
-	?>
+<?php if ($renderSourceLink) { ?>
+	<div class="source-link">
+		<a href="<?= $item_url ?>">Source</a>
+	</div>
+<?php } ?>
 
 
 <?php if ($zoom_type == "zoom") { ?>
 	<div id='<?= $id ?>' class='zoom' style='width:<?= $width ?>%; cursor:grab'>
 		<img src='<?= $image ?>' alt='<?= $title ?>'/>
 	</div>
-	<script>
-		$(document).ready(function(){
-			$('#<?= $id ?>').zoom({on:'grab', 'duration': 200, 'magnify': 1.5});
-		});
-	</script>
 <?php } ?>
 
 <?php if ($zoom_type == "wheelzoom") { ?>
 	<div class='zoom' style='display:block; width:<?= $width ?>%; cursor:crosshair'>
 		<img id="<?= $id ?>" src="<?= $image ?>" />
 	</div>
-	<script>
-		$(document).ready(function(){
-			wheelzoom(document.querySelector('#<?= $id ?>'));
-		});
-	</script>
 <?php } ?>
 
 <?php if ($zoom_type == "") { ?>
@@ -54,3 +42,27 @@
 		/>
 	</div>
 <?php } ?>
+
+<?php if ($title) { ?>
+	<div class="item_title">
+		<?= $title ?>
+	</div>
+<?php } ?>
+
+
+
+<?php if ($zoom_type == "zoom") { ?>
+	<script>
+		$(document).ready(function(){
+			$('#<?= $id ?>').zoom({on:'grab', 'duration': 200, 'magnify': 1.5});
+		});
+	</script>
+<?php } ?>
+
+<?php if ($zoom_type == "wheelzoom") { ?>
+	<script>
+		$(document).ready(function(){
+			wheelzoom(document.querySelector('#<?= $id ?>'));
+		});
+	</script>
+<?php } ?>