Refactored some more, rolled all battle popups into one class becase that is way more logical