Fixed selected tokens not updating.

Various methods regrouped and regions update.