Text now always placed on right if it's a leaf, fixed text colour issue