diff --git a/includes/GlModelTransformOutput.php b/includes/GlModelTransformOutput.php
index 8723ad5..9595b67 100644
--- a/includes/GlModelTransformOutput.php
+++ b/includes/GlModelTransformOutput.php
@@ -99,7 +99,7 @@ class GlModelTransformOutput extends MediaTransformOutput {
             } else {
                 $annotations = $metadata['annotations'];
             }
-                foreach($annotations as $label => $an) {
+            foreach($annotations as $label => $an) {
                 $elAnnot = Html::rawElement('div',['class' => 'HotspotAnnotation HiddenAnnotation'],$label);
                 $hsDefault = array(
                 'class' => 'Hotspot awaiting-model',
diff --git a/modules/glmv-prev.js b/modules/glmv-prev.js
index f833527..9f5552f 100644
--- a/modules/glmv-prev.js
+++ b/modules/glmv-prev.js
@@ -1,3 +1,4 @@
+//Annotation Edit Controls
 const addHS = new OO.ui.ButtonWidget({
 	icon: 'mapPinAdd',
 	label: 'Add annotation',
@@ -6,7 +7,6 @@ const addHS = new OO.ui.ButtonWidget({
 })
 addHS.on('click', readyAddHotspot)
 addHS.setDisabled(true)
-console.log(addHS)
 
 const updateHS = new OO.ui.ButtonWidget({
 	icon: 'reload',
@@ -24,18 +24,18 @@ const deleteHS = new OO.ui.ButtonWidget({
 deleteHS.on('click', readyDelHotspot)
 deleteHS.setDisabled(true)
 
-const hotspotButtons = new OO.ui.ButtonGroupWidget( {
+const hotspotButtons = new OO.ui.ButtonGroupWidget({
     items: [ addHS, updateHS, deleteHS ]
-} );
-console.log(hotspotButtons)
+})
 
+//View Edit Controls
 const downloadViewerImage = new OO.ui.ButtonWidget({
 	icon: 'imageAdd',
 	label: 'Download current image',
 	invisibleLabel: true
 })
 downloadViewerImage.on('click', () => {
-    downloadImage("TempTitle.glb")
+    downloadImage(mw.config.values.wgTitle)
 })
 downloadViewerImage.setDisabled(true)
 
@@ -47,19 +47,44 @@ const setView = new OO.ui.ButtonWidget({
 setView.on('click', writeCameraOrbit)
 setView.setDisabled(true)
 
-const cameraButtons = new OO.ui.ButtonGroupWidget( {
-    items: [ downloadViewerImage, setView ]
-} );
+//View Limit Controls
+const setMinYaw = new OO.ui.ButtonWidget({
+	label: 'Yaw'
+})
+setMinYaw.on('click', () => {
+    limitCameraOrbit('yaw','min')
+})
 
-const modelMenu = new OO.ui.HorizontalLayout( {
+const minLimitButtons = new OO.ui.ButtonGroupWidget({
+    items: [ setMinYaw ]
+})
+
+
+
+const setLims = new OO.ui.PopupButtonWidget({
+    label: 'Set View Limits',
+    icon: 'tableMergeCells',
+    popup: {
+        $content: $( '<p>Additional options here.</p>' ),
+        padded: true,
+        align: 'force-left'
+    }
+})
+
+const cameraButtons = new OO.ui.ButtonGroupWidget({
+    items: [ downloadViewerImage, setView ]
+})
+
+//Main Menu
+const modelMenu = new OO.ui.HorizontalLayout({
     items: [
       hotspotButtons,
       cameraButtons
     ],
     id: 'edit-model-menu'
-});
+})
 
-$('#wikiPreview').after(modelMenu.$element);
+$('#wikiPreview').after(modelMenu.$element)
 
 enableMenu = function() {
     modelMenu.items.forEach(group => {
diff --git a/modules/glmv.js b/modules/glmv.js
index 56bd85b..4caf143 100644
--- a/modules/glmv.js
+++ b/modules/glmv.js
@@ -396,7 +396,7 @@ enableViewer = function() {
  * @param {string} defName wiki page name to use as base file name
  */
 downloadImage = function(defName) {
-    const imgName = defName.substring(5).split('.')[0]
+    const imgName = defName.split('.')[0]
     const mView = $('model-viewer')[0]
 
     const dlA = document.createElement('a')