Index: gtk2_ardour/editor_routes.cc
===================================================================
--- gtk2_ardour/editor_routes.cc	(revision 6317)
+++ gtk2_ardour/editor_routes.cc	(working copy)
@@ -108,8 +108,8 @@
 	_display.append_column (*rec_state_column);
 	_display.append_column (*mute_state_column);
 	_display.append_column (*solo_state_column);
+	_display.append_column (_("Name"), _columns.text);
 	_display.append_column (_("Show"), _columns.visible);
-	_display.append_column (_("Name"), _columns.text);
 
 	_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
 	_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
@@ -125,17 +125,17 @@
 	_display.set_size_request (100, -1);
 	_display.add_object_drag (_columns.route.index(), "routes");
 
-	CellRendererText* name_cell = dynamic_cast<CellRendererText*> (_display.get_column_cell_renderer (4));
+	CellRendererText* name_cell = dynamic_cast<CellRendererText*> (_display.get_column_cell_renderer (3));
 	assert (name_cell);
 
-	TreeViewColumn* name_column = _display.get_column (4);
+	TreeViewColumn* name_column = _display.get_column (3);
 	assert (name_column);
 
 	name_column->add_attribute (name_cell->property_editable(), _columns.name_editable);
 	name_cell->property_editable() = true;
 	name_cell->signal_edited().connect (mem_fun (*this, &EditorRoutes::name_edit));
 
-	CellRendererToggle* visible_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (3));
+	CellRendererToggle* visible_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (4));
 
 	visible_cell->property_activatable() = true;
 	visible_cell->property_radio() = false;
@@ -344,7 +344,8 @@
 		row[_columns.tv] = *x;
 		row[_columns.route] = (*x)->route ();
 		row[_columns.is_track] = (boost::dynamic_pointer_cast<Track> ((*x)->route()) != 0);
-
+		row[_columns.mute_state] = (*x)->route()->muted();
+		row[_columns.solo_state] = (*x)->route()->soloed();
 		_ignore_reorder = true;
 
 		/* added a new fresh one at the end */