diff --git a/src/clock.c b/src/clock.c
index dd1eb92..a0a5860 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -726,7 +726,7 @@ create_clock_tab(GtkWidget *tab_vbox)
 	label = gtk_label_new(_("Display format string:"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
 	cal_format_combo_box = gtk_combo_box_entry_new_text();
-	gtk_box_pack_start(GTK_BOX(vbox1), cal_format_combo_box, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox1), cal_format_combo_box, FALSE, FALSE, 0);
 	gtk_combo_box_append_text(GTK_COMBO_BOX(cal_format_combo_box), cal_format);
 	gtk_combo_box_append_text(GTK_COMBO_BOX(cal_format_combo_box), DEFAULT_CAL_FORMAT);
 	gtk_combo_box_append_text(GTK_COMBO_BOX(cal_format_combo_box), ALT1_CAL_FORMAT);
@@ -745,7 +745,7 @@ create_clock_tab(GtkWidget *tab_vbox)
 	label = gtk_label_new(_("Display format string:"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
 	clock_format_combo_box = gtk_combo_box_entry_new_text();
-	gtk_box_pack_start(GTK_BOX(vbox1), clock_format_combo_box, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox1), clock_format_combo_box, FALSE, FALSE, 0);
 	gtk_combo_box_append_text(GTK_COMBO_BOX(clock_format_combo_box), clock_format);
 	gtk_combo_box_append_text(GTK_COMBO_BOX(clock_format_combo_box), DEFAULT_CLOCK_FORMAT);
 	gtk_combo_box_append_text(GTK_COMBO_BOX(clock_format_combo_box), ALT1_CLOCK_FORMAT);
diff --git a/src/cpu.c b/src/cpu.c
index 56f6d23..f0ad6c3 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -1449,7 +1449,11 @@ create_cpu_tab(GtkWidget *tab_vbox)
 	gtk_combo_box_append_text(GTK_COMBO_BOX(text_format_combo_box),
 		_("\\ww\\D3\\f\\au\\.$u\\D0\\f\\as\\.$s"));
 	gtk_combo_box_append_text(GTK_COMBO_BOX(text_format_combo_box),
-		_("\\ww\\D2\\f\\au\\.$u\\D1\\f\\as\\.$s\\D1\\f\\r$L"));
+		_("\\ww\\D2\\f\\au\\.$u\\D1\\f\\as\\.$s\\D3\\f\\r$L"));
+	gtk_combo_box_append_text(GTK_COMBO_BOX(text_format_combo_box),
+		_("\\ww\\D2\\f\\au\\.$u\\D1\\f\\as\\.$s\\D3\\f\\r$L"));
+	gtk_combo_box_append_text(GTK_COMBO_BOX(text_format_combo_box),
+		_("\\ww\\D3\\f$L\\n\\f\\as\\.$s\\n\\f\\au\\.$u"));
 
 	if (!nice_time_unsupported)
 		{
diff --git a/src/disk.c b/src/disk.c
index 42127d6..7e56c7d 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -1451,7 +1451,7 @@ create_disk_tab(GtkWidget *tab_vbox)
 	vbox1 = gkrellm_gtk_category_vbox(vbox,
 				_("Launch Commands"),
 				4, 0, TRUE);
-	launch_vbox = gkrellm_gtk_scrolled_vbox(vbox, NULL,
+	launch_vbox = gkrellm_gtk_scrolled_vbox(vbox1, NULL,
 						GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_widget_show(launch_vbox);
 	gtk_widget_realize(launch_vbox);
diff --git a/src/gui.c b/src/gui.c
index e4c8c37..b3f8d2f 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -688,11 +688,13 @@ gkrellm_gtk_category_vbox(GtkWidget *box, gchar *category_header,
 	GtkWidget	*vbox, *vbox1, *hbox, *label;
 	gchar		*s;
 
-	vbox = gtk_vbox_new(FALSE, 0);
+	vbox = gtk_vbox_new(TRUE, 0);
+	gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE);
+
 	if (pack_start)
-		gtk_box_pack_start(GTK_BOX(box), vbox, FALSE, FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(box), vbox, TRUE, TRUE, 0);
 	else
-		gtk_box_pack_end(GTK_BOX(box), vbox, FALSE, FALSE, 0);
+		gtk_box_pack_end(GTK_BOX(box), vbox, TRUE, TRUE, 0);
 
 	if (category_header)
 		{
@@ -706,7 +708,7 @@ gkrellm_gtk_category_vbox(GtkWidget *box, gchar *category_header,
 		}
 
 	hbox = gtk_hbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
 
 	label = gtk_label_new("    ");
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);