Battle GUI improvements