Changed Battle Listing and minor fixes