Fix overflow issues in the navigation tree