Did some refactoring of the Battle Screen