Reworked the battle screen a bit. I think this is good.