diff --git a/headers/private/screen_saver/BuildScreenSaverDefaultSettingsView.h b/headers/private/screen_saver/BuildScreenSaverDefaultSettingsView.h
index 73e6f7e691..41414301aa 100644
--- a/headers/private/screen_saver/BuildScreenSaverDefaultSettingsView.h
+++ b/headers/private/screen_saver/BuildScreenSaverDefaultSettingsView.h
@@ -1,22 +1,24 @@
 /*
- * Copyright 2009, Haiku.
+ * Copyright 2009 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Ryan Leavengood, leavengood@gmail.com
  */
-#ifndef BUILD_SCREEN_SAVER_DEFAULT_SETTINGS_VIEW
-#define BUILD_SCREEN_SAVER_DEFAULT_SETTINGS_VIEW
+#ifndef _BUILD_SCREEN_SAVER_DEFAULT_SETTINGS_VIEW_H
+#define _BUILD_SCREEN_SAVER_DEFAULT_SETTINGS_VIEW_H
 
 
 class BView;
 
 namespace BPrivate {
 
-void BuildScreenSaverDefaultSettingsView(BView* view, const char* moduleName, const char* info);
+void
+BuildScreenSaverDefaultSettingsView(BView* view, const char* moduleName,
+	const char* info);
 
-}
+}	// namespace BPrivate
 
 
-#endif // BUILD_SCREEN_SAVER_DEFAULT_SETTINGS_VIEW
+#endif	// _BUILD_SCREEN_SAVER_DEFAULT_SETTINGS_VIEW_H
 
diff --git a/src/kits/screensaver/BuildScreenSaverDefaultSettingsView.cpp b/src/kits/screensaver/BuildScreenSaverDefaultSettingsView.cpp
index 4b81db14f4..a8f9be5a3c 100644
--- a/src/kits/screensaver/BuildScreenSaverDefaultSettingsView.cpp
+++ b/src/kits/screensaver/BuildScreenSaverDefaultSettingsView.cpp
@@ -1,36 +1,40 @@
 /*
- * Copyright 2009, Haiku.
+ * Copyright 2009-2016 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Ryan Leavengood, leavengood@gmail.com
+ *		John Scipione, jscipione@gmail.com
  */
 
 
 #include <BuildScreenSaverDefaultSettingsView.h>
 
+#include <LayoutBuilder.h>
 #include <StringView.h>
-#include <View.h>
 
 
 namespace BPrivate {
 
-// This is used to provide a consistent look for the settings view for screen 
-// savers without any configuration.
+// Provides a consistent look for the settings view for screen savers
+// that don't provide any configuration settings.
 void
-BuildScreenSaverDefaultSettingsView(BView* view, const char* moduleName, const char* info)
+BuildScreenSaverDefaultSettingsView(BView* view, const char* moduleName,
+	const char* info)
 {
-	BRect rect(15, 15, 20, 20);
-	BStringView* stringView = new BStringView(rect, "module", moduleName);
-	stringView->SetFont(be_bold_font);
-	stringView->ResizeToPreferred();
-	view->AddChild(stringView);
-
-	rect.OffsetBy(0, stringView->Bounds().Height() + 4);
-	stringView = new BStringView(rect, "info", info);
-	stringView->ResizeToPreferred();
-	view->AddChild(stringView);
-}
+	view->SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
 
+	BStringView* nameStringView = new BStringView("module", moduleName);
+	nameStringView->SetFont(be_bold_font);
+
+	BStringView* infoStringView = new BStringView("info", info);
+
+	BLayoutBuilder::Group<>(view, B_VERTICAL, B_USE_SMALL_SPACING)
+		.Add(nameStringView)
+		.Add(infoStringView)
+		.AddGlue()
+		.SetInsets(B_USE_DEFAULT_SPACING)
+		.End();
 }
 
+}	// namespace BPrivate