Tree layout minor changes