jcheng26: added comments and minor adjustment to battle layout