Fixed some simple stuff for BattleScreeen