Improve labels in tree viewer.

Change-Id: I6ede1726d6762198b686d8add382256fe4a0105e