Remove extra buttons, fix some neutral NPCs
Split Trees to separate category; tweak text colors & positioning