Better formatting of upcoming battles