Minor changes to designs related to battles and added some needed stuff