Updated all the Popups to the new Tree structure