diff --git a/website/include/importerapp.css b/website/include/importerapp.css
index 00094f3..1057029 100644
--- a/website/include/importerapp.css
+++ b/website/include/importerapp.css
@@ -119,7 +119,8 @@ div.extbutton img
 
 div.menuitem
 {
-	padding : 2px;
+	padding : 1px 3px;
+	margin-bottom : 2px;
 	text-overflow : ellipsis;
 	white-space : nowrap;
 	overflow : hidden;
@@ -128,7 +129,7 @@ div.menuitem
 div.menuitem.highlighted
 {
 	background : #95cae4;
-	padding : 1px;
+	padding : 0px 2px;
 	border : 1px solid #008ab8;
 }
 
@@ -147,7 +148,7 @@ div.menutext
 
 img.menubutton
 {
-	padding : 2px;
+	padding : 1px;
 	float : left;
 	cursor : pointer;
 	border : 0px;
diff --git a/website/include/importerapp.js b/website/include/importerapp.js
index 5f768b4..74af5af 100644
--- a/website/include/importerapp.js
+++ b/website/include/importerapp.js
@@ -546,21 +546,28 @@ ImporterApp.prototype.HighlightMesh = function (meshIndex)
 	}
 	
 	var i, menuItem, highlight;
-	for (i = 0; i < this.meshMenuItems.length; i++) {
-		menuItem = this.meshMenuItems[i];
-		highlight = false;
-		if (i == meshIndex) {
-			if (!menuItem.IsHighlighted ()) {
-				menuItem.Highlight (true);
-				menuItem.menuItemDiv.get (0).scrollIntoView ();
-				HighlightMeshInModel (this.viewer, i, true);
-			} else {
+	if (meshIndex != -1) {
+		for (i = 0; i < this.meshMenuItems.length; i++) {
+			menuItem = this.meshMenuItems[i];
+			highlight = false;
+			if (i == meshIndex) {
+				if (!menuItem.IsHighlighted ()) {
+					menuItem.Highlight (true);
+					menuItem.menuItemDiv.get (0).scrollIntoView ();
+					HighlightMeshInModel (this.viewer, i, true);
+				} else {
+					menuItem.Highlight (false);
+					HighlightMeshInModel (this.viewer, i, false);
+				}
+			}
+		}
+	} else {
+		for (i = 0; i < this.meshMenuItems.length; i++) {
+			menuItem = this.meshMenuItems[i];
+			if (menuItem.IsHighlighted ()) {
 				menuItem.Highlight (false);
 				HighlightMeshInModel (this.viewer, i, false);
 			}
-		} else if (menuItem.IsHighlighted ()) {
-			menuItem.Highlight (false);
-			HighlightMeshInModel (this.viewer, i, false);
 		}
 	}
 };