Tree layout fix