diff --git a/src/objects/settings/actionview.c b/src/objects/settings/actionview.c
index 77e2009..34b6471 100644
--- a/src/objects/settings/actionview.c
+++ b/src/objects/settings/actionview.c
@@ -94,7 +94,7 @@
 			// Create label.
 			GtkWidget * label = gtk_label_new(gettext(views[ix].label));
 			gtk_widget_set_tooltip_markup(label,gettext(views[ix].tooltip));
-			//gtk_label_set_xalign(GTK_LABEL(label),0);
+			gtk_label_set_xalign(GTK_LABEL(label),0);
 			gtk_widget_set_hexpand(label,TRUE);
 			gtk_widget_set_vexpand(label,FALSE);
 
diff --git a/src/objects/toolbar/settings.c b/src/objects/toolbar/settings.c
index 1f6639c..f474e86 100644
--- a/src/objects/toolbar/settings.c
+++ b/src/objects/toolbar/settings.c
@@ -66,20 +66,6 @@
 
  /*--[ Implement ]------------------------------------------------------------------------------------*/
 
- static void selection_changed(GtkTreeSelection *selection, GtkWidget *button) {
-	gtk_widget_set_sensitive(button,gtk_tree_selection_count_selected_rows(selection) > 0);
- }
-
- static void toolbar_insert(GtkButton G_GNUC_UNUSED(*button), PW3270SettingsPrivate *settings) {
- 	debug("%s(%p)",__FUNCTION__,settings);
- 	pw3270_action_view_move_selected(settings->views[1],settings->views[0]);
- }
-
- static void toolbar_remove(GtkButton G_GNUC_UNUSED(*button), PW3270SettingsPrivate *settings) {
- 	debug("%s(%p)",__FUNCTION__,settings);
- 	pw3270_action_view_move_selected(settings->views[0],settings->views[1]);
- }
-
  GtkWidget * pw3270_toolbar_settings_new() {
 
  	size_t ix;
@@ -132,6 +118,7 @@
 
 			GtkWidget * box = gtk_scrolled_window_new(NULL,NULL);
 			gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(box),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
+			gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(box),GTK_SHADOW_ETCHED_IN);
 			gtk_container_add(GTK_CONTAINER(box),page->views[ix]);
 
 			gtk_grid_attach(
@@ -150,27 +137,13 @@
 		gtk_widget_set_hexpand(box,FALSE);
 		gtk_widget_set_vexpand(box,FALSE);
 
-		/*
-		page->buttons[0] = pw3270_action_view_extract_button_new(page->views[0],"go-next"),
-		page->buttons[1] = pw3270_action_view_extract_button_new(page->views[1],"go-previous"),
-
-		gtk_box_pack_start(GTK_BOX(box),page->buttons[0],FALSE,FALSE,0);
-		gtk_box_pack_end(GTK_BOX(box),page->buttons[1],FALSE,FALSE,0);
-
-		g_signal_connect(
-			page->buttons[0],
-			"clicked",
-			G_CALLBACK(toolbar_remove),
-			page
-		);
+		GtkWidget * buttons[] = {
+			pw3270_action_view_move_button_new(page->views[0],page->views[1],"go-next"),
+			pw3270_action_view_move_button_new(page->views[1],page->views[0],"go-previous"),
+		};
 
-		g_signal_connect(
-			page->buttons[1],
-			"clicked",
-			G_CALLBACK(toolbar_insert),
-			page
-		);
-		*/
+		gtk_box_pack_start(GTK_BOX(box),buttons[0],FALSE,FALSE,0);
+		gtk_box_pack_end(GTK_BOX(box),buttons[1],FALSE,FALSE,0);
 
 		gtk_grid_attach(
 			grid,
diff --git a/src/objects/window/header-settings.c b/src/objects/window/header-settings.c
index 61da247..22bbdd2 100644
--- a/src/objects/window/header-settings.c
+++ b/src/objects/window/header-settings.c
@@ -99,124 +99,6 @@
 		0,0,4,3
 	);
 
-	/*
-	// Create dialog grid
-	GtkGrid * grid = GTK_GRID(gtk_grid_new());
-	gtk_grid_set_row_homogeneous(grid,FALSE);
-	gtk_grid_set_row_spacing(GTK_GRID(grid),12);
- 	gtk_grid_set_column_spacing(GTK_GRID(grid),6);
-
-	gtk_grid_attach(
-		GTK_GRID(settings),
-		v3270_dialog_section_new(_("Itens"), _("Select the title bar itens"), GTK_WIDGET(grid)),
-		0,0,4,3
-	);
-
-	//
-	// Create views
-	//
-	{
-		GtkTreeSelection * selection;
-
-		for(ix = 0; ix < G_N_ELEMENTS(page->views); ix++) {
-
-			GtkWidget * label = gtk_label_new(gettext(views[ix].label));
-			gtk_label_set_xalign(GTK_LABEL(label),0);
-
-			gtk_grid_attach(
-				grid,
-				label,
-				views[ix].left,
-				views[ix].top,
-				1,1
-			);
-
-			page->views[ix] = pw3270_action_view_new();
-
-			selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(page->views[ix]));
-			gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
-
-			GtkWidget * box = gtk_scrolled_window_new(NULL,NULL);
-			gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(box),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
-			gtk_container_add(GTK_CONTAINER(box),page->views[ix]);
-
-			gtk_grid_attach(
-				grid,
-				box,
-				views[ix].left,
-				views[ix].top+1,
-				1,
-				views[ix].height
-			);
-
-		}
-
-		gtk_tree_view_set_reorderable(GTK_TREE_VIEW(page->views[0]),TRUE);
-		gtk_tree_view_set_reorderable(GTK_TREE_VIEW(page->views[1]),TRUE);
-		pw3270_action_view_order_by_label(page->views[2]);
-
-	}
-
-	// Create buttons
-	{
-		GtkWidget *buttons[] = {
-			pw3270_action_view_extract_button_new(page->views[0],"go-next"),
-			pw3270_action_view_extract_button_new(page->views[2],"go-previous"),
-			pw3270_action_view_extract_button_new(page->views[1],"go-next"),
-			pw3270_action_view_extract_button_new(page->views[2],"go-previous")
-		};
-
-		g_signal_connect(
-			buttons[0],
-			"clicked",
-			G_CALLBACK(remove_from_left),
-			page
-		);
-
-		g_signal_connect(
-			buttons[1],
-			"clicked",
-			G_CALLBACK(add_to_left),
-			page
-		);
-
-		g_signal_connect(
-			buttons[2],
-			"clicked",
-			G_CALLBACK(remove_from_right),
-			page
-		);
-
-		g_signal_connect(
-			buttons[3],
-			"clicked",
-			G_CALLBACK(add_to_right),
-			page
-		);
-
-
-		for(ix = 0; ix < 2; ix++) {
-			GtkWidget * box = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
-			gtk_widget_set_hexpand(box,FALSE);
-			gtk_widget_set_vexpand(box,FALSE);
-
-			gtk_box_pack_start(GTK_BOX(box),buttons[ix*2],FALSE,FALSE,0);
-			gtk_box_pack_end(GTK_BOX(box),buttons[(ix*2)+1],FALSE,FALSE,0);
-
-			gtk_grid_attach(
-				grid,
-				box,
-				views[ix].left+1,
-				views[ix].top+2,
-				1,
-				2
-			);
-
-
-		}
-
-	}
-	*/
 
 	gtk_widget_show_all(GTK_WIDGET(settings));
 	return GTK_WIDGET(settings);
--
libgit2 0.21.2