diff --git a/MaxNifPlugins_Readme.txt b/MaxNifPlugins_Readme.txt
index fafe6d5aea794e887d208d878cc8eef20023df39..5df8cb0499ae0f26771f137b116388d07819f844 100644
--- a/MaxNifPlugins_Readme.txt
+++ b/MaxNifPlugins_Readme.txt
@@ -1,10 +1,10 @@
 						MaxPlugins 0.1.2
 						================
 
-  	This releases simply introduces an importer to make a unified release.
+  	This releases introduces an importer and fixes some bugs in the exporter.
   
 	This plugin set currently consists of an exporter, importer and a utility 
- 	plugin. This is a early release, so expect it to be buggy. 
+ 	plugin. This is a early release, so expect it to be buggy.  	
 	
 	Report problems and ask questions here:
 	
@@ -16,6 +16,16 @@
 		
 	Enjoy!
 
+	Additional Notes
+	----------------
+		
+	Set the layer value to "NonCollidable", if you want to be able to walk through 
+	your objects, while still being able to activate them.
+
+	If your collision mesh comes out deformed, go to the utilities tab, 
+	choose "Reset XForm" and click "Reset Selected". This should fix it.
+
+
 	
 	Changes since 0.1
 	-----------------
@@ -34,7 +44,7 @@
 	------------
 
   	Exporter and Utility:
-    	3D Studio Max 6+, tested with version 8.
+    	3D Studio Max 6, 7 and 8
 	
   	Importer
     	3d Studio Max 8, untested with previous releases
diff --git a/NifExport/Mesh.h b/NifExport/Mesh.h
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/NifExport/NifExport.rc b/NifExport/NifExport.rc
index 6cff55c91f5277f9d7b26a8309d7ce9bd10a5df8..038667854b98a6945469e8acfb823773be7c6033 100755
--- a/NifExport/NifExport.rc
+++ b/NifExport/NifExport.rc
@@ -107,12 +107,12 @@ BEGIN
                     14,SS_NOTIFY | SS_CENTERIMAGE
     CONTROL         "&Remap Indices",IDC_CHK_REMAP,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,80,35,68,10
-    COMBOBOX        IDC_CB_GAMES,5,90,105,70,CBS_DROPDOWN | CBS_SORT | 
+    COMBOBOX        IDC_CB_GAME,5,90,105,70,CBS_DROPDOWN | CBS_SORT | 
                     WS_DISABLED | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Game",IDC_STATIC,5,79,66,8,WS_DISABLED
     EDITTEXT        IDC_CB_VERSION,115,90,45,12,ES_AUTOHSCROLL | WS_DISABLED
     LTEXT           "Version",IDC_STATIC,115,79,39,8,WS_DISABLED
-    EDITTEXT        IDC_CB_VERSION2,165,90,30,12,ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_CB_USER_VERSION,165,90,30,12,ES_AUTOHSCROLL | 
                     WS_DISABLED
     LTEXT           "User",IDC_STATIC,165,79,25,8,WS_DISABLED
 END
diff --git a/NifExport/resource.h b/NifExport/resource.h
index 9db120a8922724d24ac9a2d1f9e4e04969d2640d..520d8a8052002445c114aa5546795d1ea3692752 100755
--- a/NifExport/resource.h
+++ b/NifExport/resource.h
@@ -21,9 +21,10 @@
 #define IDC_LBL_LINK                    1011
 #define IDC_CHK_VCOLORS                 1012
 #define IDC_CHK_REMAP                   1013
-#define IDC_CB_GAMES                    1014
+#define IDC_CB_GAME                     1014
 #define IDC_CB_VERSION                  1015
 #define IDC_CB_VERSION2                 1016
+#define IDC_CB_USER_VERSION             1016
 #define IDC_COLOR                       1456
 #define IDC_EDIT                        1490
 #define IDC_SPIN                        1496
diff --git a/NifPlugins.sln b/NifPlugins.sln
index efe7bf6e4a9361446d1ff105208b781ad1b7f7db..6aa8bd9a16bc967836bf285425159665e312b284 100755
--- a/NifPlugins.sln
+++ b/NifPlugins.sln
@@ -7,12 +7,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NifProps", "NifProps\NifPro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NifFurniture", "NifFurniture\NifFurniture.vcproj", "{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NifImport", "NifImport\NifImport.vcproj", "{184D8F9A-75CA-4D26-8707-7666D9DE7D9B}"
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
-		ConfigName.0 = Debug - Max 8
-		ConfigName.1 = Release - Max 6
-		ConfigName.2 = Release - Max 7
-		ConfigName.3 = Release - Max 8
+		ConfigName.0 = Debug
+		ConfigName.1 = Debug - Max 8
+		ConfigName.2 = Release
+		ConfigName.3 = Release - Max 6
+		ConfigName.4 = Release - Max 7
+		ConfigName.5 = Release - Max 8
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.0 = {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}
@@ -20,35 +24,59 @@ Global
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.0 = {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
+		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Debug.ActiveCfg = Debug|Win32
+		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Debug.Build.0 = Debug|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Debug - Max 8.ActiveCfg = Debug|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Debug - Max 8.Build.0 = Debug|Win32
+		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release.ActiveCfg = Release|Win32
+		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release.Build.0 = Release|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 6.ActiveCfg = Release - Max 6|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 6.Build.0 = Release - Max 6|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 7.ActiveCfg = Release - Max 7|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 7.Build.0 = Release - Max 7|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 8.ActiveCfg = Release|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 8.Build.0 = Release|Win32
+		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug.ActiveCfg = Debug|Win32
+		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug.Build.0 = Debug|Win32
 		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - Max 8.ActiveCfg = Debug|Win32
 		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - Max 8.Build.0 = Debug|Win32
+		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release.ActiveCfg = Release|Win32
+		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release.Build.0 = Release|Win32
 		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 6.ActiveCfg = Release - Max 6|Win32
 		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 6.Build.0 = Release - Max 6|Win32
 		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 7.ActiveCfg = Release - Max 7|Win32
 		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 7.Build.0 = Release - Max 7|Win32
 		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 8.ActiveCfg = Release|Win32
 		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 8.Build.0 = Release|Win32
+		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Debug.ActiveCfg = Debug|Win32
+		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Debug.Build.0 = Debug|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Debug - Max 8.ActiveCfg = Debug|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Debug - Max 8.Build.0 = Debug|Win32
+		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release.ActiveCfg = Release|Win32
+		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release.Build.0 = Release|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 6.ActiveCfg = Release - Max 6|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 6.Build.0 = Release - Max 6|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 7.ActiveCfg = Release - Max 7|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 7.Build.0 = Release - Max 7|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 8.ActiveCfg = Release|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 8.Build.0 = Release|Win32
+		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Debug.ActiveCfg = Debug|Win32
+		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Debug.Build.0 = Debug|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Debug - Max 8.ActiveCfg = Debug|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Debug - Max 8.Build.0 = Debug|Win32
+		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release.ActiveCfg = Release|Win32
+		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release.Build.0 = Release|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 6.ActiveCfg = Release - Max 6|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 7.ActiveCfg = Release - Max 7|Win32
 		{E7CB76AA-6113-46BA-8EBC-8AE1D2B81210}.Release - Max 8.ActiveCfg = Release|Win32
+		{184D8F9A-75CA-4D26-8707-7666D9DE7D9B}.Debug.ActiveCfg = Debug|Win32
+		{184D8F9A-75CA-4D26-8707-7666D9DE7D9B}.Debug.Build.0 = Debug|Win32
+		{184D8F9A-75CA-4D26-8707-7666D9DE7D9B}.Debug - Max 8.ActiveCfg = Debug|Win32
+		{184D8F9A-75CA-4D26-8707-7666D9DE7D9B}.Release.ActiveCfg = Release|Win32
+		{184D8F9A-75CA-4D26-8707-7666D9DE7D9B}.Release.Build.0 = Release|Win32
+		{184D8F9A-75CA-4D26-8707-7666D9DE7D9B}.Release - Max 6.ActiveCfg = Release|Win32
+		{184D8F9A-75CA-4D26-8707-7666D9DE7D9B}.Release - Max 7.ActiveCfg = Release|Win32
+		{184D8F9A-75CA-4D26-8707-7666D9DE7D9B}.Release - Max 8.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/NifProps/NifProps.cpp b/NifProps/NifProps.cpp
index c691cad7e5275a39f5578f140383a509ca9ddeb8..f2a5f79efbe63f9e61c4b18484cec36d7216e010 100755
--- a/NifProps/NifProps.cpp
+++ b/NifProps/NifProps.cpp
@@ -184,8 +184,13 @@ void NifProps::enableGUI(BOOL obj, BOOL hvk)
 	EnableWindow(GetDlgItem(mPanel, IDC_GRP_OBJECT), obj);
 	EnableWindow(GetDlgItem(mPanel, IDC_CHK_ISCOLL), obj);
 
-	for (int i=IDC_HVK_BEGIN; i<=IDC_HVK_END; i++)
-		EnableWindow(GetDlgItem(mPanel, i), hvk);
+	EnableWindow(GetDlgItem(mPanel, IDC_GRP_HAVOK), hvk);
+	EnableWindow(GetDlgItem(mPanel, IDC_LBL_MATERIAL), hvk);
+	EnableWindow(GetDlgItem(mPanel, IDC_CB_MATERIAL), hvk);
+	EnableWindow(GetDlgItem(mPanel, IDC_LBL_LAYER), hvk);
+	EnableWindow(GetDlgItem(mPanel, IDC_CB_LAYER), hvk);
+//	for (int i=IDC_HVK_BEGIN; i<=IDC_HVK_END; i++)
+//		EnableWindow(GetDlgItem(mPanel, i), hvk);
 }
 
 void NifProps::SelectionSetChanged(Interface *ip, IUtil *iu)
diff --git a/NifProps/NifProps.rc b/NifProps/NifProps.rc
index a23f776bd4940c84c33190cd02dd10171ccb0e12..67b87a2ddcee11b3757ccd0b8c4a7c509b38207e 100755
--- a/NifProps/NifProps.rc
+++ b/NifProps/NifProps.rc
@@ -73,100 +73,103 @@ END
 // Dialog
 //
 
-IDD_PANEL DIALOGEX 0, 0, 107, 402
+IDD_PANEL DIALOGEX 0, 0, 107, 401
 STYLE DS_SETFONT | DS_3DLOOK | WS_CHILD | WS_VISIBLE
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    COMBOBOX        IDC_CB_MATERIAL,12,130,83,157,CBS_DROPDOWNLIST | 
+    COMBOBOX        IDC_CB_MATERIAL,12,58,83,157,CBS_DROPDOWNLIST | 
                     WS_DISABLED | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Material",IDC_LBL_MATERIAL,"Static",SS_LEFTNOWORDWRAP | 
-                    SS_CENTERIMAGE | WS_DISABLED | WS_GROUP,12,121,83,8
-    COMBOBOX        IDC_CB_LAYER,12,154,83,171,CBS_DROPDOWNLIST | 
-                    WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+                    SS_CENTERIMAGE | WS_DISABLED | WS_GROUP,12,50,83,8
+    COMBOBOX        IDC_CB_LAYER,12,82,83,171,CBS_DROPDOWNLIST | WS_DISABLED | 
+                    WS_VSCROLL | WS_TABSTOP
     CONTROL         "Layer",IDC_LBL_LAYER,"Static",SS_LEFTNOWORDWRAP | 
-                    SS_CENTERIMAGE | WS_DISABLED | WS_GROUP,12,145,83,8
-    GROUPBOX        "Havok",IDC_GRP_HAVOK,5,110,95,285,WS_DISABLED
-    GROUPBOX        "Object",IDC_GRP_OBJECT,5,76,95,32
+                    SS_CENTERIMAGE | WS_DISABLED | WS_GROUP,12,74,83,8
+    GROUPBOX        "Havok",IDC_GRP_HAVOK,5,39,95,285,WS_DISABLED
+    GROUPBOX        "Object",IDC_GRP_OBJECT,5,5,95,32
     CONTROL         "Is Collision Mesh",IDC_CHK_ISCOLL,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,14,89,80,10
-    GROUPBOX        "Global",IDC_STATIC,5,7,95,65
-    EDITTEXT        IDC_ED_BSXFLAGS,13,30,80,12,ES_AUTOHSCROLL
+                    BS_AUTOCHECKBOX | WS_TABSTOP,14,18,80,10
+    GROUPBOX        "Global",IDC_STATIC,5,329,95,65,WS_DISABLED
+    EDITTEXT        IDC_ED_BSXFLAGS,13,352,80,12,ES_AUTOHSCROLL | 
+                    WS_DISABLED
     CONTROL         "BSXFlags",IDC_LBL_BSXFLAGS,"Static",SS_LEFTNOWORDWRAP | 
-                    SS_CENTERIMAGE | WS_GROUP,13,18,80,8
-    EDITTEXT        IDC_ED_STRINGSEXTRA,13,52,80,12,ES_AUTOHSCROLL
+                    SS_CENTERIMAGE | WS_DISABLED | WS_GROUP,13,340,80,8
+    EDITTEXT        IDC_ED_STRINGSEXTRA,13,374,80,12,ES_AUTOHSCROLL | 
+                    WS_DISABLED
     CONTROL         "Strings Extra Data",IDC_LBL_STRINGSEXTRA,"Static",
-                    SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | WS_GROUP,13,43,80,8
+                    SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | WS_DISABLED | 
+                    WS_GROUP,13,365,80,8
     CONTROL         "Center",IDC_LBL_CENTER,"Static",SS_LEFTNOWORDWRAP | 
-                    SS_CENTERIMAGE | WS_DISABLED | WS_GROUP,12,170,31,8
+                    SS_CENTERIMAGE | WS_DISABLED | WS_GROUP,12,98,31,8
     CONTROL         "Mass",IDC_LBL_MASS,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_DISABLED | WS_GROUP,12,195,28,8
+                    WS_DISABLED | WS_GROUP,12,124,28,8
     CONTROL         "Friction",IDC_LBL_FRICTION,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_DISABLED | WS_GROUP,42,195,28,8
-    LTEXT           "Resti-\r\ntution",IDC_LBL_RESTITUTION,70,195,24,15,
+                    WS_DISABLED | WS_GROUP,42,124,28,8
+    LTEXT           "Resti-\r\ntution",IDC_LBL_RESTITUTION,70,124,24,15,
                     WS_DISABLED
     CONTROL         "Motion System",IDC_LBL_MOTION_SYSTEM,"Static",
                     SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | WS_DISABLED | 
-                    WS_GROUP,12,335,67,8
-    COMBOBOX        IDC_CB_MOTION_SYSTEM,12,344,83,74,CBS_DROPDOWNLIST | 
+                    WS_GROUP,12,263,67,8
+    COMBOBOX        IDC_CB_MOTION_SYSTEM,12,273,83,74,CBS_DROPDOWNLIST | 
                     WS_DISABLED | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Quality Type",IDC_LBL_QUALITY_TYPE,"Static",
                     SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | WS_DISABLED | 
-                    WS_GROUP,12,360,43,8
-    COMBOBOX        IDC_CB_QUALITY_TYPE,12,369,83,63,CBS_DROPDOWN | 
+                    WS_GROUP,12,289,43,8
+    COMBOBOX        IDC_CB_QUALITY_TYPE,12,298,83,63,CBS_DROPDOWN | 
                     WS_DISABLED | WS_VSCROLL | WS_TABSTOP
     CONTROL         "",IDC_ED_CENTER_X,"CustEdit",WS_DISABLED | WS_TABSTOP,
-                    12,180,20,10
-    CONTROL         "",IDC_SP_CENTER_X,"SpinnerControl",WS_DISABLED,30,180,7,
+                    12,109,20,10
+    CONTROL         "",IDC_SP_CENTER_X,"SpinnerControl",WS_DISABLED,30,109,7,
                     10
     CONTROL         "",IDC_ED_CENTER_Y,"CustEdit",WS_DISABLED | WS_TABSTOP,
-                    42,180,20,10
-    CONTROL         "",IDC_SP_CENTER_Y,"SpinnerControl",WS_DISABLED,60,180,7,
+                    42,109,20,10
+    CONTROL         "",IDC_SP_CENTER_Y,"SpinnerControl",WS_DISABLED,60,109,7,
                     10
     CONTROL         "",IDC_ED_CENTER_Z,"CustEdit",WS_DISABLED | WS_TABSTOP,
-                    72,180,20,10
-    CONTROL         "",IDC_SP_CENTER_Z,"SpinnerControl",WS_DISABLED,92,180,7,
+                    72,109,20,10
+    CONTROL         "",IDC_SP_CENTER_Z,"SpinnerControl",WS_DISABLED,92,109,7,
                     10
     CONTROL         "",IDC_ED_MASS,"CustEdit",WS_DISABLED | WS_TABSTOP,12,
-                    215,20,10
-    CONTROL         "",IDC_SP_MASS,"SpinnerControl",WS_DISABLED,30,215,7,10
+                    143,20,10
+    CONTROL         "",IDC_SP_MASS,"SpinnerControl",WS_DISABLED,30,143,7,10
     CONTROL         "",IDC_ED_FRICTION,"CustEdit",WS_DISABLED | WS_TABSTOP,
-                    42,215,20,10
-    CONTROL         "",IDC_SP_FRICTION,"SpinnerControl",WS_DISABLED,60,215,7,
+                    42,143,20,10
+    CONTROL         "",IDC_SP_FRICTION,"SpinnerControl",WS_DISABLED,60,143,7,
                     10
     CONTROL         "",IDC_ED_RESTITUTION,"CustEdit",WS_DISABLED | 
-                    WS_TABSTOP,70,215,20,10
+                    WS_TABSTOP,70,143,20,10
     CONTROL         "",IDC_SP_RESTITUTION,"SpinnerControl",WS_DISABLED,90,
-                    215,7,10
-    LTEXT           "Linear\r\nDamping",IDC_LBL_LINEAR_DAMPING,12,230,30,17,
+                    143,7,10
+    LTEXT           "Linear\r\nDamping",IDC_LBL_LINEAR_DAMPING,12,159,30,17,
                     WS_DISABLED
     CONTROL         "",IDC_ED_LINEAR_DAMPING,"CustEdit",WS_DISABLED | 
-                    WS_TABSTOP,12,250,35,10
+                    WS_TABSTOP,12,178,35,10
     CONTROL         "",IDC_SP_LINEAR_DAMPING,"SpinnerControl",WS_DISABLED,45,
-                    250,7,10
-    LTEXT           "Angular\r\nDamping",IDC_LBL_ANGULAR_DAMPING,55,230,45,
+                    178,7,10
+    LTEXT           "Angular\r\nDamping",IDC_LBL_ANGULAR_DAMPING,55,159,45,
                     17,WS_DISABLED
     CONTROL         "",IDC_ED_ANGULAR_DAMPING,"CustEdit",WS_DISABLED | 
-                    WS_TABSTOP,55,250,35,10
+                    WS_TABSTOP,55,178,35,10
     CONTROL         "",IDC_SP_ANGULAR_DAMPING,"SpinnerControl",WS_DISABLED,
-                    90,250,7,10
+                    90,178,7,10
     LTEXT           "Max. Linear\r\nVelocity",IDC_LBL_MAX_LINEAR_VELOCITY,12,
-                    265,40,16,WS_DISABLED
+                    194,40,16,WS_DISABLED
     CONTROL         "",IDC_ED_MAX_LINEAR_VELOCITY,"CustEdit",WS_DISABLED | 
-                    WS_TABSTOP,12,285,35,10
+                    WS_TABSTOP,12,214,35,10
     CONTROL         "",IDC_SP_MAX_LINEAR_VELOCITY,"SpinnerControl",
-                    WS_DISABLED,45,285,7,10
+                    WS_DISABLED,45,214,7,10
     LTEXT           "Max. Angular\r\nVelocity",IDC_LBL_MAX_ANGULAR_VELOCITY,
-                    55,265,45,16,WS_DISABLED
+                    55,194,45,16,WS_DISABLED
     CONTROL         "",IDC_ED_MAX_ANGULAR_VELOCITY,"CustEdit",WS_DISABLED | 
-                    WS_TABSTOP,55,285,35,10
+                    WS_TABSTOP,55,214,35,10
     CONTROL         "",IDC_SP_MAX_ANGULAR_VELOCITY,"SpinnerControl",
-                    WS_DISABLED,90,285,7,10
-    LTEXT           "Penetration\r\nDepth",IDC_LBL_PENETRATION_DEPTH,12,300,
+                    WS_DISABLED,90,214,7,10
+    LTEXT           "Penetration\r\nDepth",IDC_LBL_PENETRATION_DEPTH,12,229,
                     40,16,WS_DISABLED
     CONTROL         "",IDC_ED_PENETRATION_DEPTH,"CustEdit",WS_DISABLED | 
-                    WS_TABSTOP,12,320,35,10
+                    WS_TABSTOP,12,249,35,10
     CONTROL         "",IDC_SP_PENETRATION_DEPTH,"SpinnerControl",WS_DISABLED,
-                    45,320,7,10
+                    45,249,7,10
 END
 
 
@@ -183,7 +186,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 100
         TOPMARGIN, 7
-        BOTTOMMARGIN, 395
+        BOTTOMMARGIN, 394
     END
 END
 #endif    // APSTUDIO_INVOKED