Updated BattleScreen and Battlefield