Added some functionality. Mainly in pokemon views