Merge branch 'Matt-Branch-4'

Added Label to BattleScreen