diff --git a/scripts/viewer.html b/scripts/viewer.html
index 07e4e98..4a1b19c 100644
--- a/scripts/viewer.html
+++ b/scripts/viewer.html
@@ -13,6 +13,8 @@
 <script>
   let startImage = window.frameElement.getAttribute("panoimage") ? window.frameElement.getAttribute("panoimage") : '../docs/assets/img/startimage.jpg'
   const panoAdapter = window.frameElement.getAttribute("panoMode") === "cubemap" ? PhotoSphereViewer.CubemapAdapter : PhotoSphereViewer.EquirectangularAdapter
+  const srcArray = JSON.parse(window.frameElement.getAttribute("panoGalItems"))
+
   let panoviewer
 
   document.querySelector("body").style.margin = "0";
@@ -43,7 +45,6 @@
       onClick: (viewer) => {
         // normalize path
         startImage = startImage.replace(/\\/g, "/");
-        const srcArray = JSON.parse(frameElement.getAttribute("panoGalItems"))
         if (srcArray.length === 1) { return }
         const currentIndex = srcArray.indexOf(startImage)
         var previousIndex = currentIndex - 1
@@ -51,7 +52,9 @@
           previousIndex = srcArray.length - 1
         }
         startImage = srcArray[previousIndex]
-        viewer.setPanorama(startImage, { caption: startImage.replace(/^.*[\\\/]/, '') })
+        viewer.setPanorama(startImage, {
+          caption: "(x/" + srcArray.length + ") " + startImage.replace(/^.*[\\\/]/, ''),
+        })
       },
     },
     {
@@ -60,12 +63,11 @@
       title: 'Next image from gallery',
       className: 'pano-nav-nextimg',
       onClick: (viewer) => {
-        const srcArray = JSON.parse(frameElement.getAttribute("panoGalItems"))
         if (srcArray.length === 1) { return }
         const currentIndex = srcArray.indexOf(startImage);
         var nextIndex = (currentIndex + 1) % srcArray.length;
         startImage = srcArray[nextIndex];
-        viewer.setPanorama(startImage, { caption: startImage.replace(/^.*[\\\/]/, '') })
+        viewer.setPanorama(startImage, { caption: "(x/" + srcArray.length + ") " + startImage.replace(/^.*[\\\/]/, '') })
       },
     },
     'caption',
@@ -83,7 +85,7 @@
             path: startImage
           },
           navbar: navBarCustomButtons,
-          caption: startImage.replace(/^.*[\\\/]/, ''),
+          caption: "(x/" + srcArray.length + ") " + startImage.replace(/^.*[\\\/]/, ''),
           keyboardActions: panoViewerKeyboardActions
         }
         break
@@ -93,7 +95,7 @@
           panorama: startImage,
           adapter: panoAdapter,
           navbar: navBarCustomButtons,
-          caption: startImage.replace(/^.*[\\\/]/, ''),
+          caption: "(x/" + srcArray.length + ") " + startImage.replace(/^.*[\\\/]/, ''),
           keyboardActions: panoViewerKeyboardActions
         }
     }
@@ -102,10 +104,10 @@
     let panObj = opts ? opts : PanOptionsFor(window.frameElement.getAttribute("panoMode"))
     panoviewer = new PhotoSphereViewer.Viewer(panObj)
     panoviewer.animate({
-      yaw: Math.PI * 2,
+      yaw: Math.PI,
       pitch: '360deg',
       zoom: 20,
-      speed: '3rpm',
+      speed: '2rpm',
     })
   }