Many pets fixes

 * sprite fixes for cactus
 * use pet.name instead of pet.text for unique identification
 * move some pets html around