[Change Pokemon in battle after selecting one by mistake?]

Twice: I selected Mega Metagross to catch a Lvl 7 pokemon because that's first on my roster. Any way to change it?

[Colour code rarity of pokemon, and more focus on the pokemon]

Hi, i made a mockup of what I'd like to see personally. I am no expert, obviously.

 

 

1. More focus on the Pokemon. I tend to miss a few rarer Pokemons.

2. Colour coded Names based on rarity. 

• White/Common
• Blue/Rare
• Yellow/Ultra Rare
• Orange/Legendary

3. Show the Type of the Pokemon

4. Show time of day closer to map to give more context. Time is weird for me as I live in the opposite time-zone.

5. 'Options' can be combined with Account Settings and the drop down next to profile top right.

6. Streamlined top bar.