fixing the design of the battle window
Merge remote-tracking branch 'jira/design' into design