diff --git a/ground/views/modals/image.php b/ground/views/modals/image.php
index 6bf3529..d4a0c36 100644
--- a/ground/views/modals/image.php
+++ b/ground/views/modals/image.php
@@ -9,9 +9,6 @@
 				<img src="" id="imageModalImg" style="max-width: 555px; max-height: 450px;" />
 				<div class="fotorama" data-loop="true" data-auto="false" maxwidth="555" maxheight="450" ></div>
 			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
-			</div>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/public/js/app.js b/public/js/app.js
index 525d069..9d4c842 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -81,6 +81,11 @@ function showImage(id)
 
 	if (typeof(point.images) == 'object')
 	{
+		if( typeof($('.fotorama').data('fotorama')) != 'undefined' )
+		{
+			$('.fotorama').data('fotorama').destroy();
+		}
+
 		$('#imageModalImg').hide();
 		$('.fotorama').show();
 
diff --git a/public/js/map.js b/public/js/map.js
index 4de1ba1..e56f96d 100644
--- a/public/js/map.js
+++ b/public/js/map.js
@@ -171,7 +171,10 @@ function showInfo(id)
 				pointsSources[id] = data;
 				if (typeof(data.images) == 'object')
 				{
-					ph = '<div class="photosCount"><span class="glyphicon glyphicon-camera"></span> <b>+' + (data.photosCount-1) + '</b></div>';
+					ph = '';
+					if (data.images.length > 1)
+						ph = '<div class="photosCount"><span class="glyphicon glyphicon-camera"></span> <b>+' + (data.photosCount-1) + '</b></div>';
+
 					ph += '<img src="/photos/small/' + data.img + '" onclick="showImage(\''+ id +'\')" />';
 				}
 				else