diff --git a/tools/assimp_view/Display.cpp b/tools/assimp_view/Display.cpp
index fb27eb169..808347a2a 100644
--- a/tools/assimp_view/Display.cpp
+++ b/tools/assimp_view/Display.cpp
@@ -166,11 +166,12 @@ int CDisplay::AddNodeToDisplayList(
 			iIndex += iDepth  * 100;
 		}
 		else iIndex += iDepth  * 10;
-		sprintf(chTemp,"Node %i (%i meshes)",iIndex,pcNode->mNumMeshes);
+		sprintf(chTemp,"Node %i",iIndex);
 	}
 	else {
-		sprintf(chTemp,"%s (%i meshes)",pcNode->mName.data,pcNode->mNumMeshes);
+		sprintf(chTemp,"%s",pcNode->mName.data);
 	}
+	sprintf(chTemp+strlen(chTemp),  iIndex ? " (%i)" : " (%i meshes)",pcNode->mNumMeshes);
 
 	TVITEMEXW tvi; 
 	TVINSERTSTRUCTW sNew;
@@ -218,11 +219,12 @@ int CDisplay::AddMeshToDisplayList(unsigned int iIndex, HTREEITEM hRoot)
 	char chTemp[MAXLEN];
 
 	if(0 == pcMesh->mName.length)	{
-		sprintf(chTemp,"Mesh %i (%i faces)",iIndex,pcMesh->mNumFaces);
+		sprintf(chTemp,"Mesh %i",iIndex);
 	}
 	else {
-		sprintf(chTemp,"%s (%i faces)",pcMesh->mName.data,pcMesh->mNumFaces);
+		sprintf(chTemp,"%s",pcMesh->mName.data);
 	}
+	sprintf(chTemp+strlen(chTemp),  iIndex ? " (%i)" : " (%i faces)",pcMesh->mNumFaces);
 
 	TVITEMEXW tvi; 
 	TVINSERTSTRUCTW sNew;
diff --git a/tools/assimp_view/assimp_view.rc b/tools/assimp_view/assimp_view.rc
index 71dcd2b1a..a48cdbe0c 100644
--- a/tools/assimp_view/assimp_view.rc
+++ b/tools/assimp_view/assimp_view.rc
@@ -92,7 +92,7 @@ BEGIN
     LTEXT           "[A]",IDC_STATIC,194,395,13,9
     LTEXT           "[Z]",IDC_STATIC,194,406,13,9
     LTEXT           "[R]",IDC_STATIC,194,417,13,9
-    COMBOBOX        IDC_COMBO1,332,372,98,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_COMBO1,317,373,112,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Nodes:",IDC_NUMNODES,221,413,28,9
     EDITTEXT        IDC_ENODEWND,253,411,37,14,ES_AUTOHSCROLL | ES_READONLY
     CONTROL         "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,474,0,141,484
@@ -102,18 +102,18 @@ BEGIN
     CONTROL         "Button1",IDC_LCOLOR1,"Button",BS_OWNERDRAW | WS_TABSTOP,408,396,59,20
     CONTROL         "Button1",IDC_LCOLOR2,"Button",BS_OWNERDRAW | WS_TABSTOP,408,419,59,20
     CONTROL         "Button1",IDC_LCOLOR3,"Button",BS_OWNERDRAW | WS_TABSTOP,408,442,59,20
-    PUSHBUTTON      "Reset",IDC_LRESET,432,468,33,13,BS_BOTTOM
+    PUSHBUTTON      "Reset",IDC_LRESET,434,464,33,13,BS_BOTTOM
     EDITTEXT        IDC_VIEWMATRIX,220,411,71,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE
     CONTROL         "Show skeleton",IDC_SHOWSKELETON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,457,58,12
     LTEXT           "[K]",IDC_STATIC,84,447,13,9
-    CONTROL         "<<",IDC_BLUBB,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,431,371,36,14
+    CONTROL         "<<",IDC_BLUBB,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,431,372,36,14
     LTEXT           "[C]",IDC_STATIC,84,459,13,9
-    CONTROL         "",IDC_SLIDERANIM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,0,371,300,16
-    PUSHBUTTON      "Play",IDC_PLAY,301,372,29,13
+    CONTROL         "",IDC_SLIDERANIM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,0,371,290,16
+    PUSHBUTTON      "Play",IDC_PLAY,291,372,25,14
     CONTROL         "Backface culling",IDC_BFCULL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,468,65,12
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDVERT,209,392,1,70
     CONTROL         "",IDC_RT,"Static",SS_OWNERDRAW,0,0,471,366
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,388,471,1
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,390,471,1
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDVERT,472,0,1,484
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDVERT,365,392,1,70
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,1,367,471,1