diff --git a/website/include/importerapp.js b/website/include/importerapp.js
index e81e7a4..882919b 100644
--- a/website/include/importerapp.js
+++ b/website/include/importerapp.js
@@ -280,6 +280,17 @@ ImporterApp.prototype.GenerateMenu = function ()
 					},
 					title : 'Show/Hide Mesh',
 					userData : meshIndex
+				},
+				{
+					id : 'fitinwindow-' + meshIndex,
+					onCreate : function (image) {
+						image.attr ('src', 'images/fitinwindowsmall.png');
+					},
+					onClick : function (image, meshIndex) {
+						importerApp.FitMeshInWindow (meshIndex);
+					},
+					title : 'Show/Hide Mesh',
+					userData : meshIndex
 				}
 			]
 		});
@@ -406,6 +417,11 @@ ImporterApp.prototype.FitInWindow = function ()
 	this.viewer.FitInWindow ();
 };
 
+ImporterApp.prototype.FitMeshInWindow = function (meshIndex)
+{
+	this.viewer.FitMeshInWindow (meshIndex);
+};
+
 ImporterApp.prototype.SetFixUp = function ()
 {
 	this.viewer.SetFixUp ();
diff --git a/website/include/importerviewer.js b/website/include/importerviewer.js
index 6a82699..333ecc9 100644
--- a/website/include/importerviewer.js
+++ b/website/include/importerviewer.js
@@ -72,50 +72,46 @@ ImporterViewer.prototype.ShowAllMeshes = function (inEnvironment)
 
 ImporterViewer.prototype.ShowMesh = function (index)
 {
-	var i, mesh;
-	var workJsonData = {
-		version : this.jsonData.version,
-		materials : this.jsonData.materials,
-		meshes : [this.jsonData.meshes[index]]
-	};
-	
-	var meshes = JSM.ConvertJSONDataToThreeMeshes (workJsonData, this.Draw.bind (this));
-	for (i = 0; i < meshes.length; i++) {
-		mesh = meshes[i];
-		mesh.originalJsonIndex = index;
-		this.viewer.AddMesh (mesh);
-	}
-	
+	var myThis = this;
+	this.viewer.scene.traverse (function (current) {
+		if (current instanceof THREE.Mesh) {
+			if (current.originalJsonIndex == index) {
+				myThis.viewer.ShowMesh (current);
+			}
+		}
+	});
 	this.viewer.Draw ();
 };
 
 ImporterViewer.prototype.HideMesh = function (index)
 {
-	var meshesToRemove = [];
-	var currentIndex = 0;
+	var myThis = this;
 	this.viewer.scene.traverse (function (current) {
 		if (current instanceof THREE.Mesh) {
 			if (current.originalJsonIndex == index) {
-				meshesToRemove.push (current);
+				myThis.viewer.HideMesh (current);
 			}
-			currentIndex = currentIndex + 1;
 		}
 	});
-	
-	var i, mesh;
-	for (i = 0; i < meshesToRemove.length; i++) {
-		mesh = meshesToRemove[i];
-		this.viewer.scene.remove (mesh);
-	}
-
 	this.viewer.Draw ();
 };
 
 ImporterViewer.prototype.FitInWindow = function ()
 {
-	if (this.viewer.MeshCount () > 0) {
-		this.viewer.FitInWindow ();
-	}
+	this.viewer.FitInWindow ();
+};
+
+ImporterViewer.prototype.FitMeshInWindow = function (index)
+{
+	var meshes = [];
+	this.viewer.scene.traverse (function (current) {
+		if (current instanceof THREE.Mesh) {
+			if (current.originalJsonIndex == index) {
+				meshes.push (current);
+			}
+		}
+	});
+	this.viewer.FitMeshesInWindow (meshes);
 };
 
 ImporterViewer.prototype.AdjustClippingPlanes = function ()