improved icon & image display
Merge remote-tracking branch 'coyotte/design' into design
battle options part of the battle window