Fixed New Battle bugs.
Fixed UI bugs.
Merge remote-tracking branch 'upstream/master' into fix_dialog_centering