diff --git a/Source/Core/Controls/ImageBrowserItem.cs b/Source/Core/Controls/ImageBrowserItem.cs
index 3c1b1c51..b805d050 100755
--- a/Source/Core/Controls/ImageBrowserItem.cs
+++ b/Source/Core/Controls/ImageBrowserItem.cs
@@ -67,8 +67,8 @@ namespace CodeImp.DoomBuilder.Controls
 			this.tooltip = tooltip; //mxd
             
 			//mxd. Calculate names width
-			this.namewidth = (int)Math.Ceiling(General.Interface.MeasureString(icon.Name, SystemFonts.MessageBoxFont, 10000, StringFormat.GenericTypographic).Width);
-			this.shortnamewidth = (int)Math.Ceiling(General.Interface.MeasureString(icon.ShortName, SystemFonts.MessageBoxFont, 10000, StringFormat.GenericTypographic).Width);
+			this.namewidth = (int)Math.Ceiling(General.Interface.MeasureString(icon.Name, SystemFonts.MessageBoxFont, 10000, StringFormat.GenericTypographic).Width)+6;
+			this.shortnamewidth = (int)Math.Ceiling(General.Interface.MeasureString(icon.ShortName, SystemFonts.MessageBoxFont, 10000, StringFormat.GenericTypographic).Width)+6;
 		}
 
 		#endregion
diff --git a/Source/Core/Rendering/Renderer3D.cs b/Source/Core/Rendering/Renderer3D.cs
index 2a97a145..62d0e12e 100755
--- a/Source/Core/Rendering/Renderer3D.cs
+++ b/Source/Core/Rendering/Renderer3D.cs
@@ -969,7 +969,7 @@ namespace CodeImp.DoomBuilder.Rendering
 			if(General.Map.VisualCamera.Sector != null)
 			{
 				// If the camera is inside a sector, compare z coordinates
-				translucentgeo.Sort(delegate(VisualGeometry vg1, VisualGeometry vg2)
+				geopass.Sort(delegate(VisualGeometry vg1, VisualGeometry vg2)
 				{
 					if(vg1 == vg2) return 0;
 					float camdist1, camdist2;
@@ -999,7 +999,7 @@ namespace CodeImp.DoomBuilder.Rendering
 			}
 			else
 			{
-				translucentgeo.Sort(delegate(VisualGeometry vg1, VisualGeometry vg2)
+                geopass.Sort(delegate(VisualGeometry vg1, VisualGeometry vg2)
 				{
 					if(vg1 == vg2) return 0;
 					return (int)((General.Map.VisualCamera.Position - vg2.BoundingBox[0]).GetLengthSq()
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualLower.cs b/Source/Plugins/BuilderModes/VisualModes/VisualLower.cs
index bbb4e1fc..8d9c34ed 100755
--- a/Source/Plugins/BuilderModes/VisualModes/VisualLower.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualLower.cs
@@ -112,10 +112,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
 					base.Texture = General.Map.Data.UnknownTexture3D;
 					setuponloadedtexture = Sidedef.LongLowTexture;
 				}
-				else
-				{
-					if(!base.Texture.IsImageLoaded)
-						setuponloadedtexture = Sidedef.LongLowTexture;
+				else if (!base.Texture.IsImageLoaded)
+                {
+					setuponloadedtexture = Sidedef.LongLowTexture;
 				}
 			}
 			else
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualMiddleDouble.cs b/Source/Plugins/BuilderModes/VisualModes/VisualMiddleDouble.cs
index e240d2c9..f7ec28f7 100755
--- a/Source/Plugins/BuilderModes/VisualModes/VisualMiddleDouble.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualMiddleDouble.cs
@@ -115,7 +115,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				else if(!base.Texture.IsImageLoaded) 
 				{
 					setuponloadedtexture = Sidedef.LongMiddleTexture;
-				}
+                }
 			} 
 			else 
 			{
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualUpper.cs b/Source/Plugins/BuilderModes/VisualModes/VisualUpper.cs
index 7e753cab..c5ed026d 100755
--- a/Source/Plugins/BuilderModes/VisualModes/VisualUpper.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualUpper.cs
@@ -113,10 +113,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
 					base.Texture = General.Map.Data.UnknownTexture3D;
 					setuponloadedtexture = Sidedef.LongHighTexture;
 				}
-				else
-				{
-					if(!base.Texture.IsImageLoaded)
-						setuponloadedtexture = Sidedef.LongHighTexture;
+				else if (!base.Texture.IsImageLoaded)
+                {
+					setuponloadedtexture = Sidedef.LongHighTexture;
 				}
 			}
 			else