Implemented previously mentioned refactoring in Battlescreen