jcheng26 lchen59: Fix bugs in main activity to associate with
BattleActivity