Index: gtk2_ardour/editor_routes.cc
===================================================================
--- gtk2_ardour/editor_routes.cc	(revision 6505)
+++ gtk2_ardour/editor_routes.cc	(working copy)
@@ -119,8 +119,10 @@
 	_display.append_column (*mute_state_column);
 	_display.append_column (*solo_state_column);
 	_display.append_column (*solo_isolate_state_column);
+	
+	_display.append_column (_("Name"), _columns.text);
 	_display.append_column (_("Show"), _columns.visible);
-	_display.append_column (_("Name"), _columns.text);
+	
 
 	_display.set_headers_visible (true);
 	_display.set_name ("TrackListDisplay");
@@ -130,17 +132,20 @@
 	_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 (5));
+
+	CellRendererText* name_cell = dynamic_cast<CellRendererText*> (_display.get_column_cell_renderer (4));
+
 	assert (name_cell);
 
-	TreeViewColumn* name_column = _display.get_column (5);
+	TreeViewColumn* name_column = _display.get_column (4);
+
 	assert (name_column);
 
 	name_column->add_attribute (name_cell->property_editable(), _columns.name_editable);
 	name_cell->property_editable() = true;
 	name_cell->signal_edited().connect (sigc::mem_fun (*this, &EditorRoutes::name_edit));
 
-	CellRendererToggle* visible_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (4));
+	CellRendererToggle* visible_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (5));
 
 	visible_cell->property_activatable() = true;
 	visible_cell->property_radio() = false;
@@ -378,6 +383,9 @@
 		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();
+		row[_columns.solo_isolate_state] = (*x)->route()->solo_isolated();
 
 		_ignore_reorder = true;
 
@@ -702,7 +710,35 @@
 		show_menu ();
 		return true;
 	}
+	
+	//Scroll editor canvas to selected track
+	if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+		
+		TreeModel::Path path;
+		TreeViewColumn *tvc;
+		int cell_x;
+		int cell_y;
+		
+		_display.get_path_at_pos ((int) ev->x, (int) ev->y, path, tvc, cell_x, cell_y);
 
+		// Get the model row.
+		Gtk::TreeModel::Row row = *_model->get_iter (path);
+		
+		TimeAxisView *tv = row[_columns.tv];
+		
+		int y_pos = tv->y_position();
+		
+		//Clamp the y pos so that we do not extend beyond the canvas full height.
+		if (_editor->full_canvas_height - y_pos < _editor->_canvas_height){
+		    y_pos = _editor->full_canvas_height - _editor->_canvas_height;
+		}
+		
+		//Only scroll to if the track is visible
+		if(y_pos != -1){
+		    _editor->reset_y_origin (y_pos);
+		}
+	}
+	
 	return false;
 }