Changes to UI, player pokemon.
Merge resolved.