Tree drawing code cleanup
Fix tree color and improve display code