diff --git a/src/preferences/3drendering/CapabilitiesView.cpp b/src/preferences/3drendering/CapabilitiesView.cpp
index 1247cceb0f..df02aa3b92 100644
--- a/src/preferences/3drendering/CapabilitiesView.cpp
+++ b/src/preferences/3drendering/CapabilitiesView.cpp
@@ -35,7 +35,7 @@ CapabilitiesView::CapabilitiesView()
 {
 	// add the columns
 
-	float capabilityColWidth = this->StringWidth("M") * 24;
+	float capabilityColWidth = this->StringWidth("M") * 23;
 
 	fCapabilityColumn = new BStringColumn(B_TRANSLATE("Capability"),
 		capabilityColWidth, capabilityColWidth - 20.0,
@@ -102,7 +102,7 @@ CapabilitiesView::CapabilitiesView()
 	// add the list
 
 	AddChild(fCapabilitiesList);
-	GroupLayout()->SetInsets(-1, -1, -1, -1);
+	GroupLayout()->SetInsets(5.0, 5.0, 5.0, 5.0);
 }
 
 
diff --git a/src/preferences/3drendering/ExtensionsView.cpp b/src/preferences/3drendering/ExtensionsView.cpp
index 2ff829bab0..806bb9a989 100644
--- a/src/preferences/3drendering/ExtensionsView.cpp
+++ b/src/preferences/3drendering/ExtensionsView.cpp
@@ -33,7 +33,7 @@ ExtensionsView::ExtensionsView()
 {
 	// add the columns
 
-	float availableColWidth = this->StringWidth("M") * 28;
+	float availableColWidth = this->StringWidth("M") * 27;
 
 	fAvailableColumn = new BStringColumn(B_TRANSLATE("Available extensions"),
 		availableColWidth, availableColWidth, availableColWidth,
@@ -50,7 +50,7 @@ ExtensionsView::ExtensionsView()
 	// add the list
 
 	AddChild(fExtensionsList);
-	GroupLayout()->SetInsets(-1, -1, -1, -1);
+	GroupLayout()->SetInsets(5.0, 5.0, 5.0, 5.0);
 }
 
 
diff --git a/src/preferences/3drendering/GearsView.cpp b/src/preferences/3drendering/GearsView.cpp
index f5e44bc37c..618cac2a30 100644
--- a/src/preferences/3drendering/GearsView.cpp
+++ b/src/preferences/3drendering/GearsView.cpp
@@ -52,7 +52,7 @@ GearsView::Draw(BRect updateRect)
 
 	SetDrawingMode(B_OP_ALPHA);
 	SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
-	DrawBitmapAsync(fGears, BPoint(5.0, 30.0));
+	DrawBitmapAsync(fGears, BPoint(5.0, 18.0));
 }
 
 
diff --git a/src/preferences/3drendering/InfoView.cpp b/src/preferences/3drendering/InfoView.cpp
index 1c2071c24d..fd211384ec 100644
--- a/src/preferences/3drendering/InfoView.cpp
+++ b/src/preferences/3drendering/InfoView.cpp
@@ -13,14 +13,15 @@
 
 #include <Catalog.h>
 #include <ControlLook.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
+#include <GL/glut.h>
+#include <GridLayoutBuilder.h>
 #include <LayoutBuilder.h>
 #include <Locale.h>
 #include <Message.h>
 #include <String.h>
 #include <StringView.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
-#include <GL/glut.h>
 
 
 #undef B_TRANSLATE_CONTEXT
@@ -71,14 +72,12 @@ InfoView::InfoView()
 	BLayoutBuilder::Group<>(this)
 		.AddGroup(B_VERTICAL, 0)
 			.Add(rendererView)
-			.AddGroup(B_HORIZONTAL, 0)
-				.Add(vendorNameView)
-				.Add(glVersionView)
-				.End()
-			.AddGroup(B_HORIZONTAL, 0)
-				.Add(gluVersionView)
-				.Add(glutVersionView)
-				.End()
+			.Add(BGridLayoutBuilder(0, 0)
+				.Add(vendorNameView, 0, 0)
+				.Add(glVersionView, 1, 0)
+				.Add(gluVersionView, 0, 1)
+				.Add(glutVersionView, 1, 1)
+			)
 			.End();
 }
 
diff --git a/src/preferences/3drendering/OpenGLView.cpp b/src/preferences/3drendering/OpenGLView.cpp
index a1e839cc39..9d694d860e 100644
--- a/src/preferences/3drendering/OpenGLView.cpp
+++ b/src/preferences/3drendering/OpenGLView.cpp
@@ -61,7 +61,7 @@ OpenGLView::OpenGLView()
 	menuField->SetEnabled(false);
 
 	float tabViewWidth = this->StringWidth("M") * 36;
-	float tabViewHeight = this->StringWidth("M") * 19;
+	float tabViewHeight = this->StringWidth("M") * 16;
 
 	BTabView *tabView = new BTabView("tab view", B_WIDTH_FROM_LABEL);
 	tabView->SetExplicitMinSize(BSize(tabViewWidth, tabViewHeight));