Index: trunk/gui/citylist_frame_t.cc
===================================================================
--- trunk/gui/citylist_frame_t.cc	(Revision 9857)
+++ trunk/gui/citylist_frame_t.cc	(Arbeitskopie)
@@ -102,25 +102,12 @@
 
 	list.set_table_layout(1,0);
 
-	list.add_table(5, 0);
-	list.new_component_span<gui_label_t>("hl_txt_sort",2);
+	list.add_table(3, 3);
+	list.new_component<gui_label_t>("Filter:", 1);
 	name_filter_input.set_text(name_filter, lengthof(name_filter));
-	list.add_component(&name_filter_input, 2);
+	list.add_component(&name_filter_input, 1);
 	list.new_component<gui_fill_t>();
 
-	sortedby.set_unsorted(); // do not sort
-	for (size_t i = 0; i < lengthof(sort_text); i++) {
-		sortedby.new_component<gui_scrolled_list_t::const_text_scrollitem_t>(translator::translate(sort_text[i]), SYSCOL_TEXT);
-	}
-	sortedby.set_selection(citylist_stats_t::sort_mode & 0x1F);
-	sortedby.add_listener(this);
-	list.add_component(&sortedby);
-
-	sorteddir.init(button_t::sortarrow_state, NULL);
-	sorteddir.pressed = citylist_stats_t::sort_mode > citylist_stats_t::SORT_MODES;
-	sorteddir.add_listener(this);
-	list.add_component(&sorteddir);
-
 	filter_by_owner.init( button_t::square_automatic, "Served by" );
 	filter_by_owner.add_listener(this);
 	filter_by_owner.set_tooltip( "At least one stop is connected to the town" );
@@ -138,6 +125,22 @@
 	list.add_component(&filterowner);
 	list.new_component<gui_fill_t>();
 
+
+	list.new_component<gui_label_t>("hl_txt_sort", 1);
+	sortedby.set_unsorted(); // do not sort
+	for (size_t i = 0; i < lengthof(sort_text); i++) {
+		sortedby.new_component<gui_scrolled_list_t::const_text_scrollitem_t>(translator::translate(sort_text[i]), SYSCOL_TEXT);
+	}
+	sortedby.set_selection(citylist_stats_t::sort_mode & 0x1F);
+	sortedby.add_listener(this);
+	list.add_component(&sortedby);
+
+	sorteddir.init(button_t::sortarrow_state, NULL);
+	sorteddir.pressed = citylist_stats_t::sort_mode > citylist_stats_t::SORT_MODES;
+	sorteddir.add_listener(this);
+	list.add_component(&sorteddir);
+
+
 	list.end_table();
 	list.add_component(&scrolly);
 	fill_list();
Index: trunk/gui/convoi_frame.cc
===================================================================
--- trunk/gui/convoi_frame.cc	(Revision 9857)
+++ trunk/gui/convoi_frame.cc	(Arbeitskopie)
@@ -205,13 +205,17 @@
 
 	set_table_layout(1,0);
 
-	add_table(5,2);
+	add_table(4,2);
 	{
-		new_component_span<gui_label_t>("cl_txt_sort", 2);
+		new_component<gui_label_t>("Filter:", 1);
 		name_filter_input.set_text( name_filter, lengthof(name_filter) );
-		add_component(&name_filter_input,2);
+		add_component(&name_filter_input, 1);
+		filter_details.init(button_t::roundbox, "cl_btn_filter_settings");
+		filter_details.add_listener(this);
+		add_component(&filter_details);
 		new_component<gui_fill_t>();
 
+		new_component<gui_label_t>("cl_txt_sort", 1);
 		sortedby.set_unsorted(); // do not sort
 		for(  size_t i=0;  i < lengthof(sort_text);  i++  ) {
 			sortedby.new_component<gui_scrolled_list_t::const_text_scrollitem_t>(translator::translate(sort_text[i]),SYSCOL_TEXT);
@@ -225,10 +229,6 @@
 		sorteddir.pressed = get_reverse();
 		add_component(&sorteddir);
 
-		new_component<gui_label_t>("Filter:",ALIGN_RIGHT);
-		filter_details.init(button_t::roundbox, "cl_btn_filter_settings");
-		filter_details.add_listener(this);
-		add_component(&filter_details);
 		new_component<gui_fill_t>();
 	}
 	end_table();
Index: trunk/gui/curiositylist_frame_t.cc
===================================================================
--- trunk/gui/curiositylist_frame_t.cc	(Revision 9857)
+++ trunk/gui/curiositylist_frame_t.cc	(Arbeitskopie)
@@ -37,26 +37,13 @@
 	attraction_count = 0;
 
 	set_table_layout(1,0);
-	add_table(5, 2);
+	add_table(3, 3);
 	{
-		new_component_span<gui_label_t>("hl_txt_sort", 2);
+		new_component<gui_label_t>("Filter:", 1);
 		name_filter_input.set_text(name_filter, lengthof(name_filter));
-		add_component(&name_filter_input, 2);
+		add_component(&name_filter_input, 1);
 		new_component<gui_fill_t>();
 
-		sortedby.set_unsorted(); // do not sort
-		for (size_t i = 0; i < lengthof(sort_text); i++) {
-			sortedby.new_component<gui_scrolled_list_t::const_text_scrollitem_t>(translator::translate(sort_text[i]), SYSCOL_TEXT);
-		}
-		sortedby.set_selection(curiositylist_stats_t::sortby);
-		sortedby.add_listener(this);
-		add_component(&sortedby);
-
-		sorteddir.init(button_t::sortarrow_state, NULL);
-		sorteddir.add_listener(this);
-		sorteddir.pressed = curiositylist_stats_t::sortby;
-		add_component(&sorteddir);
-
 		filter_by_owner.init(button_t::square_automatic, "Served by");
 		filter_by_owner.add_listener(this);
 		filter_by_owner.set_tooltip("At least one tile is connected to one stop");
@@ -72,7 +59,22 @@
 		}
 		filterowner.add_listener(this);
 		add_component(&filterowner);
+		new_component<gui_fill_t>();
 
+		new_component_span<gui_label_t>("hl_txt_sort", 1);
+		sortedby.set_unsorted(); // do not sort
+		for (size_t i = 0; i < lengthof(sort_text); i++) {
+			sortedby.new_component<gui_scrolled_list_t::const_text_scrollitem_t>(translator::translate(sort_text[i]), SYSCOL_TEXT);
+		}
+		sortedby.set_selection(curiositylist_stats_t::sortby);
+		sortedby.add_listener(this);
+		add_component(&sortedby);
+
+		sorteddir.init(button_t::sortarrow_state, NULL);
+		sorteddir.add_listener(this);
+		sorteddir.pressed = curiositylist_stats_t::sortby;
+		add_component(&sorteddir);
+
 		new_component<gui_fill_t>();
 	}
 	end_table();
Index: trunk/gui/factorylist_frame_t.cc
===================================================================
--- trunk/gui/factorylist_frame_t.cc	(Revision 9857)
+++ trunk/gui/factorylist_frame_t.cc	(Arbeitskopie)
@@ -36,26 +36,13 @@
 
 	set_table_layout(1,0);
 	set_table_layout(1, 0);
-	add_table(5, 2);
+	add_table(3, 3);
 	{
-		new_component_span<gui_label_t>("hl_txt_sort", 2);
+		new_component<gui_label_t>("Filter:", 1);
 		name_filter_input.set_text(name_filter, lengthof(name_filter));
-		add_component(&name_filter_input, 2);
+		add_component(&name_filter_input, 1);
 		new_component<gui_fill_t>();
 
-		sortedby.set_unsorted(); // do not sort
-		for (size_t i = 0; i < lengthof(sort_text); i++) {
-			sortedby.new_component<gui_scrolled_list_t::const_text_scrollitem_t>(translator::translate(sort_text[i]), SYSCOL_TEXT);
-		}
-		sortedby.set_selection(factorylist_stats_t::sort_mode);
-		sortedby.add_listener(this);
-		add_component(&sortedby);
-
-		sorteddir.init(button_t::sortarrow_state, NULL);
-		sorteddir.add_listener(this);
-		sorteddir.pressed = factorylist_stats_t::reverse;
-		add_component(&sorteddir);
-
 		filter_by_owner.init(button_t::square_automatic, "Served by");
 		filter_by_owner.add_listener(this);
 		filter_by_owner.set_tooltip("At least one tile is connected to one stop");
@@ -71,7 +58,21 @@
 		}
 		filterowner.add_listener(this);
 		add_component(&filterowner);
+		new_component<gui_fill_t>();
 
+		new_component_span<gui_label_t>("hl_txt_sort", 1);
+		sortedby.set_unsorted(); // do not sort
+		for (size_t i = 0; i < lengthof(sort_text); i++) {
+			sortedby.new_component<gui_scrolled_list_t::const_text_scrollitem_t>(translator::translate(sort_text[i]), SYSCOL_TEXT);
+		}
+		sortedby.set_selection(factorylist_stats_t::sort_mode);
+		sortedby.add_listener(this);
+		add_component(&sortedby);
+
+		sorteddir.init(button_t::sortarrow_state, NULL);
+		sorteddir.add_listener(this);
+		sorteddir.pressed = factorylist_stats_t::reverse;
+		add_component(&sorteddir);
 		new_component<gui_fill_t>();
 	}
 	end_table();
Index: trunk/gui/halt_list_frame.cc
===================================================================
--- trunk/gui/halt_list_frame.cc	(Revision 9857)
+++ trunk/gui/halt_list_frame.cc	(Arbeitskopie)
@@ -126,13 +126,17 @@
 
 	set_table_layout(1, 0);
 
-	add_table(5, 2);
+	add_table(4, 2);
 	{
-		new_component_span<gui_label_t>("hl_txt_sort", 2);
+		new_component<gui_label_t>("Filter:", 2);
 		name_filter_input.set_text(name_filter, lengthof(name_filter));
-		add_component(&name_filter_input, 2);
+		add_component(&name_filter_input, 1);
+		filter_details.init(button_t::roundbox, "cl_btn_filter_settings");
+		filter_details.add_listener(this);
+		add_component(&filter_details);
 		new_component<gui_fill_t>();
 
+		new_component_span<gui_label_t>("hl_txt_sort", 1);
 		sortedby.set_unsorted(); // do not sort
 		for (size_t i = 0; i < lengthof(sort_text); i++) {
 			sortedby.new_component<gui_scrolled_list_t::const_text_scrollitem_t>(translator::translate(sort_text[i]), SYSCOL_TEXT);
@@ -146,10 +150,6 @@
 		sorteddir.pressed = get_reverse();
 		add_component(&sorteddir);
 
-		new_component<gui_label_t>("Filter:", ALIGN_RIGHT);
-		filter_details.init(button_t::roundbox, "cl_btn_filter_settings");
-		filter_details.add_listener(this);
-		add_component(&filter_details);
 		new_component<gui_fill_t>();
 	}
 	end_table();
Index: trunk/gui/labellist_frame_t.cc
===================================================================
--- trunk/gui/labellist_frame_t.cc	(Revision 9857)
+++ trunk/gui/labellist_frame_t.cc	(Arbeitskopie)
@@ -24,13 +24,20 @@
 {
 	set_table_layout(1,0);
 
-	add_table(4, 2);
+	add_table(3, 3);
 	{
-		new_component_span<gui_label_t>("hl_txt_sort", 2);
+		new_component<gui_label_t>("Filter:", 1);
 		name_filter_input.set_text(name_filter, lengthof(name_filter));
 		add_component(&name_filter_input, 1);
 		new_component<gui_fill_t>();
 
+		filter.init( button_t::square_automatic, "Active player only");
+		filter.pressed = labellist_stats_t::filter;
+		add_component(&filter, 2);
+		filter.add_listener( this );
+		new_component<gui_fill_t>();
+
+		new_component_span<gui_label_t>("hl_txt_sort", 1);
 		sortedby.set_unsorted(); // do not sort
 		for (size_t i = 0; i < lengthof(sort_text); i++) {
 			sortedby.new_component<gui_scrolled_list_t::const_text_scrollitem_t>(translator::translate(sort_text[i]), SYSCOL_TEXT);
@@ -44,11 +51,6 @@
 		sorteddir.pressed = labellist_stats_t::sortreverse;
 		add_component(&sorteddir);
 
-		filter.init( button_t::square_automatic, "Active player only");
-		filter.pressed = labellist_stats_t::filter;
-		add_component(&filter);
-		filter.add_listener( this );
-
 		new_component<gui_fill_t>();
 	}
 	end_table();