Updated startup tree and waiting tree

Fixed: Going to castle wars
Choosing a portal
Properly reading and switching of trees.