Minor changes to visual tree