Improve ui/ux tree